[SCM] Git repository for devscripts branch, master, updated. v2.11.1-13-g3d27c6a
The following commit has been merged in the master branch:
commit 3d27c6a7206b91ca4d43efb07621a1491fab1c11
Author: James Vega james...@debian.org
Date: Mon Oct 17 20:55:26 2011 -0400
uscan: Fully support lzma and xz tarballs.
Closes: #631713
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 1f074fe..5b1570b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low
supported. Thanks to Matthijs Kooijman for the patch. (Closes: #639813)
* mergechanges: Use awk instead of sed to handle massaging the final output
so we can better control the processing. (Closes: #640782)
+ * uscan: Fully support lzma and xz tarballs. Based on a patch from Tanguy
+Ortolo. (Closes: #631713)
[ Stefano Rivera ]
* debchange: Add precise as a recognised Ubuntu distro.
diff --git a/scripts/uscan.1 b/scripts/uscan.1
index efb1a39..15e529a 100644
--- a/scripts/uscan.1
+++ b/scripts/uscan.1
@@ -182,10 +182,8 @@ available is newer than the current version, then it is
downloaded
into the parent directory, unless the \fB\-\-report\fR or
\fR\-\-report-status\fR option has been used. Once the file has been
downloaded, then a symlink to the file is made from
-\fIpackage_version.orig.tar.gz\fR if the file has a \fI.tar.gz\fR
-or a \fI.tgz\fR suffix and from \fIpackage_version.orig.tar.bz2\fR
-if the file has a \fI.tar.bz2\fR or a \fI.tbz\fR or \fI.tbz2\fR
-suffix.
+\fIpackage_version.orig.tar.{gz|bz2|lzma|xz}\fR as described by the help
+for the \fB\-\-symlink\fR option.
.PP
Finally, if a third parameter (an action) is given in the \fIwatch\fR file
line, this is taken as the name of a command, and the command
@@ -364,25 +362,26 @@ Set timeout to N seconds (default 20 seconds).
.TP
.B \-\-symlink
Make orig.tar.gz symlinks to any downloaded files if their extensions
-are \fI.tar.gz\fR or \fI.tgz\fR, and similarly for to orig.tar.bz2 for
-the suffixes \fI.tar.gz\fR, \fI.tbz\fR and \fI.tbz2\fR. (This is the
+are \fI.tar.gz\fR or \fI.tgz\fR. This is also handled for orig.tar.bz2 (for
+upstream \fI.tar.bz2\fR, \fI.tbz\fR, and \fI.tbz2\fR), orig.tar.lzma (for
+upstream \fI.tar.lzma\fR, \fI.tlz\fR, \fI.tlzm\fR, and \fI.tlzma\fR), and
+orig.tar.xz (for upstream \fI.tar.xz\fR and \fI.txz\fR). (This is the
default behaviour.)
.TP
.B \-\-rename
Instead of symlinking, rename the downloaded files to their Debian
-\fIorig.tar.gz\fR names if their extensions are \fI.tar.gz\fR or \fI.tgz\fR,
-and similarly for \fItar.bz2\fR files.
+\fIorig.tar.gz\fR, \fIorig.tar.bz2\fR, \fIorig.tar.lzma\fR, or
+\fIorig.tar.xz\fR names as described above.
.TP
.B \-\-repack
After having downloaded an lzma tar, xz tar, bzip tar or zip archive,
repack it to a gzip tar archive, which is still currently required as a
member of a Debian source package. Does nothing if the downloaded
archive is not an lzma tar archive, xz tar archive, bzip tar archive or
-a zip archive (i.e. it doesn't match a .tlz, .tar.lzma, .txz, .tar.xz
-\^.tbz, .tbz2, .tar.bz2 or .zip extension). The unzip package must be
-installed in order to repack .zip archives, the lzma package must be
-installed to repack lzma tar archives, and the xz-utils package must be
-installed to repack xz tar archives.
+a zip archive (i.e. it doesn't match a .tlz, .tlzm, .tlzma, .tar.lzma, .txz,
+\^.tar.xz .tbz, .tbz2, .tar.bz2 or .zip extension). The unzip package must be
+installed in order to repack .zip archives, the xz-utils package must be
+installed to repack lzma or xz tar archives.
.TP
.B \-\-no\-symlink
Don't make these symlinks and don't rename the files.
@@ -474,7 +473,7 @@ If set to a number \fIN\fR, then set the timeout to \fIN\fR
seconds.
This is equivalent to the \fB\-\-timeout\fR option.
.TP
.B USCAN_SYMLINK
-If this is set to \fIno\fR, then a pkg_version.orig.tar.{gz|bz2}
+If this is set to \fIno\fR, then a pkg_version.orig.tar.{gz|bz2|lzma|xz}
symlink will not be made (equivalent to the \fB\-\-no\-symlink\fR
option). If it is set to \fIyes\fR or \fIsymlink\fR, then the
symlinks will be made. If it is set to \fIrename\fR, then the files
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2962c47..58a8b3e 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -92,9 +92,10 @@ Options:
servers to respond (default 20 seconds)
--symlink Make an orig.tar.gz symlink to downloaded file (default)
--rename Rename to orig.tar.gz instead of symlinking
- (Both will use orig.tar.bz2 if appropriate)
---repack Repack downloaded archives from orig.tar.bz2 or orig.zip to
- orig.tar.gz
+ (Both will use orig.tar.bz2, orig.tar.lzma, or orig.tar.xz
+ if appropriate)
+--repack Repack downloaded archives from orig.tar.bz2, orig.tar.lzma,
+ orig.tar.xz or orig.zip to orig.tar.gz
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-14-gcef2b1c
The following commit has been merged in the master branch: commit cef2b1c0360d24fae49882e1b89391d390e9c84c Author: James Vega james...@debian.org Date: Mon Oct 17 21:22:51 2011 -0400 debi: Document --multi, --with-depends, and --tool in the man page. Closes: #644983 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 5b1570b..84f6265 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low so we can better control the processing. (Closes: #640782) * uscan: Fully support lzma and xz tarballs. Based on a patch from Tanguy Ortolo. (Closes: #631713) + * debi: Document --multi, --with-depends, and --tool in the man page. +(Closes: #644983) [ Stefano Rivera ] * debchange: Add precise as a recognised Ubuntu distro. diff --git a/scripts/debi.1 b/scripts/debi.1 index 534f689..d9bb6be 100644 --- a/scripts/debi.1 +++ b/scripts/debi.1 @@ -76,6 +76,9 @@ Look for the \fI.changes\fR and \fI.deb\fR files in directory either be an absolute path or relative to the top of the source directory. .TP +\fB\-\-multi\fR +Search for a multiarch \fI.changes\fR file, as created by \fBdpkg-cross\fR. +.TP \fB\-\-upgrade\fR Only upgrade packages already installed on the system, rather than installing all packages listed in the \fI.changes\fR file. @@ -90,6 +93,13 @@ this option. See the above section Directory name checking for an explanation of this option. .TP +\fB\-\-with-depends\fR +Attempt to satisfy the \fIDepends\fR of a package when installing it. +.TP +\fB\-\-tool\fR \fITOOL\fR +Use the specified tool for installing the dependencies of the package(s) to be +installed. By default, \fBapt-get\fR is used. +.TP \fB\-\-no-conf\fR, \fB\-\-noconf\fR Do not read any configuration files. This can only be used as the first option given on the command-line. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-12-g31e362e
The following commit has been merged in the master branch:
commit 31e362e46ccacc1fa0936cf80b1eaf72b45fe2f5
Author: James Vega james...@debian.org
Date: Sat Oct 8 18:17:37 2011 -0400
mergechanges: Use awk to properly process the final output.
Closes: #640782
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 3100fe7..1f074fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low
for the patch. (Closes: #641497)
* debchange: Document that only `$1' backreference replacements are
supported. Thanks to Matthijs Kooijman for the patch. (Closes: #639813)
+ * mergechanges: Use awk instead of sed to handle massaging the final output
+so we can better control the processing. (Closes: #640782)
[ Stefano Rivera ]
* debchange: Add precise as a recognised Ubuntu distro.
diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh
index bb8fceb..36407e1 100755
--- a/scripts/mergechanges.sh
+++ b/scripts/mergechanges.sh
@@ -25,7 +25,7 @@ PROGNAME=`basename $0`
usage () {
echo \
-Usage: $PROGNAME [--help|--version] [-f] file1 file2 [file ...]
+Usage: $PROGNAME [-h|--help|--version] [-f] file1 file2 [file ...]
Merge the changes files file1, file2, Output on stdout
unless -f option given, in which case, output to
package_version_multi.changes in the same directory as file1.
@@ -46,7 +46,7 @@ FILE=0
while [ $# -gt 0 ]; do
case $1 in
- --help)
+ -h|--help)
usage
exit 0
;;
@@ -188,14 +188,27 @@ else
cp $1 ${OUTPUT}
fi
-# Replace the Architecture: field, nuke the value of Files:, and insert
-# the Description: field before the Changes: field
-eval sed -e 's,^Architecture: .*,Architecture: ${ARCHS},' \
--e '/^Checksums-.*:/,/^[^ ]/{/^Checksums-.*:/d;/^ /d}' \
--e '/^Files:/,/^[^ ]/{/^Files:/d;/^ /d}' \
--e '/^Description:/,/^[^ ]/{/^Description:/d;/^ /d}' \
--e '/^Changes:/{r '${DESCFILE} -e ';aChanges: ' -e ';d}' \
--e 's,^Format: .*,Format: ${FORMATS},' \
+# Replace the Architecture: field, nuke the value of Checksums-*: and Files:,
+# and insert the Description: field before the Changes: field
+eval awk -- '/^[^ ]/{ field=\\ }
+/^ /{
+if (length(field) != 0) {
+print
+}
+next
+}
+/^Architecture: /{printf \%s ${ARCHS}\\n\, \$1; next}
+/^Changes:/{
+field=\$0
+while ((getline \${DESCFILE}\) 0) {
+print
+}
+printf \%s\\n\, field
+next
+}
+/^Format: /{ printf \%s ${FORMATS}\\n\, \$1; next}
+/^(Checksums-.*|Files|Description):/{ next }
+{ print }' \
${OUTPUT} ${REDIR1}
# Voodoo magic to get the merged file and checksum lists into the output
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#530285: devscripts: Add dependencies (git-buildpackage) and various documentations
On Sat, May 23, 2009 at 08:23:40PM +0200, Frank Lin PIAT wrote: Here are a few dependency that would be useful for developers. I don't think it's devscripts' job to be a general helpful packages metapackage. We have enough dependencies (in the general sense) just in support of the scripts we provide. A package[0] which does aim to be what you're asking for has recently been uploaded. It already has many of the below packages listed. If you think it could be improved, feel free to reassign this bug to them. Otherwise, I'll soon close this bug report. Recommends: Consider adding darcs, debhelper, dpatch|quilt, git-buildpackage, dash|posh Suggests: Consider suggesting some documentations, like: debian-policy, developers-reference, debconf-doc, gettext-doc, maint-guide, make-doc, gnupg-doc (as well as perl-doc, python-doc?) [0]: http://packages.debian.org/packaging-dev -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-9-g917d833
The following commit has been merged in the master branch:
commit 917d833db3495bdc1252d3e739e8ef68f5710105
Author: Adam Langley a...@chromium.org
Date: Tue Sep 27 15:07:53 2011 -0400
Add additional regexp for MIT licenses.
Harfbuzz (at least) uses an MIT-style license that isn't currently
recognised
(see below). This change adds recognition of that variant.
(This matches the form `Modern Variants' on
http://fedoraproject.org/wiki/Licensing:MIT)
Permission is hereby granted, without written agreement and without
license or royalty fees, to use, copy, modify, and distribute this
software and its documentation for any purpose, provided that the
above copyright notice and the following two paragraphs appear in
all copies of this software.
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
ON AN AS IS BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index ddbd037..461de28 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -441,6 +441,8 @@ sub parselicense($) {
$license = MIT/X11 (BSD like) $license;
} elsif ($licensetext =~ /Permission is hereby granted, free of charge, to
any person obtaining a copy of this software and associated documentation files
\(the Software\), to deal in the Software/) {
$license = MIT/X11 (BSD like) $license;
+} elsif ($licensetext =~ /Permission is hereby granted, without written
agreement and without license or royalty fees, to use, copy, modify, and
distribute this software and its documentation for any purpose/) {
+ $license = MIT/X11 (BSD like) $license;
}
if ($licensetext =~ /Permission to use, copy, modify, and(\/or)?
distribute this software for any purpose with or without fee is hereby granted,
provided.*copyright notice.*permission notice.*all copies/) {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-10-g2f7a9fe
The following commit has been merged in the master branch:
commit 2f7a9fec310594651f7e3c1f134d4dfab44224c7
Author: James Vega james...@debian.org
Date: Thu Sep 29 22:05:17 2011 -0400
debchange: Document that only `$1' backreference replacements are supported.
Closes: #639813
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 88dc251..4fe8392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low
- Update uses of getopt to show usage when getopt fails.
* licensecheck: Recognize more generated files. Thanks to Paweł Hajdan, Jr
for the patch. (Closes: #641497)
+ * debchange: Document that only `$1' backreference replacements are
+supported. Thanks to Matthijs Kooijman for the patch. (Closes: #639813)
-- Gerfried Fuchs rho...@debian.org Fri, 26 Aug 2011 21:09:51 +0200
diff --git a/scripts/uscan.1 b/scripts/uscan.1
index 1e240b7..efb1a39 100644
--- a/scripts/uscan.1
+++ b/scripts/uscan.1
@@ -246,6 +246,11 @@ this should not be a problem.
operation is used, only the '\fBg\fR', '\fBi\fR' and '\fBx\fR' flags are
available and
\fIrule\fR may not contain any expressions which have the potential to
execute code (i.e. the (?{}) and (??{}) constructs are not supported).
+
+If the '\fBs\fR' operation is used, the replacement can contain
+backreferences to expressions within parenthesis in the matching regexp,
+like `\fBs/-alpha(\\d*)/.a$1/\fR'. These backreferences must use the
+`\fB$1\fR' syntax, as the `\fB\\1\fR' syntax is not supported.
.TP
\fBdversionmangle=\fIrules\fR
This is used to mangle the Debian version number of the currently
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-7-g734dce3
The following commit has been merged in the master branch:
commit cb52dfd74635e4638e6471092f18d6e68a8d8398
Author: Paweł Hajdan, Jr phajdan...@chromium.org
Date: Tue Sep 13 14:21:31 2011 -0700
Recognize more types of generated files.
This is a part of an effort to make Chromium project sources
pass licensecheck: http://code.google.com/p/chromium/issues/detail?id=28291
Signed-off-by: Paweł Hajdan, Jr phajdan...@chromium.org
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 8f9caf8..4c5a41c 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -406,7 +406,7 @@ sub parselicense($) {
$extrainfo = (with Qt exception)$extrainfo
}
-if ($licensetext =~ /(All changes made in this file will be lost|DO NOT
(EDIT|delete this file)|Generated by)/i) {
+if ($licensetext =~ /(All changes made in this file will be lost|DO NOT
(EDIT|delete this file)|Generated (automatically|by|from)|generated.*file)/i) {
$license = GENERATED FILE;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-7-g734dce3
The following commit has been merged in the master branch:
commit 734dce3ba926cd39d6df7602a4dd027e77bacf95
Author: James Vega james...@debian.org
Date: Thu Sep 22 20:57:02 2011 -0400
Update scripts to use GNU getopt-compatible option parsing.
For Perl scripts, use Getopt::Long's gnu_compat and bundling modes.
When
allowed, also use permute for full GNU getopt compatibility.
For shell scripts, use getopt instead of manual option parsing.
- Update uses of getopt to show usage when getopt fails.
Closes: #641979
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 1b17ec5..e754fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ devscripts (2.11.2) UNRELEASED; urgency=low
* Remove support for PGP-style commands from debsign/debrsign. (Closes:
#639204)
+ DEBSIGN_SIGNLIKE config variable removed
+ * Update scripts to use GNU getopt-compatible option parsing. (Closes:
+#641979)
++ For Perl scripts, use Getopt::Long's gnu_compat and bundling modes.
+ When allowed, also use permute for full GNU getopt compatibility.
++ For shell scripts, use getopt instead of manual option parsing.
+ - Update uses of getopt to show usage when getopt fails.
-- Gerfried Fuchs rho...@debian.org Fri, 26 Aug 2011 21:09:51 +0200
diff --git a/scripts/bts.pl b/scripts/bts.pl
index 8b8ce2e..9f011d0 100755
--- a/scripts/bts.pl
+++ b/scripts/bts.pl
@@ -561,7 +561,7 @@ my $opt_ccemail = ;
my $use_default_cc = 1;
my $ccsecurity=;
-Getopt::Long::Configure('require_order');
+Getopt::Long::Configure(qw(gnu_compat bundling require_order));
GetOptions(help|h = \$opt_help,
version = \$opt_version,
o = \$offlinemode,
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index 1a6ea36..c425509 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -92,7 +92,7 @@ use warnings;
use strict;
use File::Basename;
use File::Find;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use Pod::Usage;
use Data::Dumper;
my $progname = basename($0);
@@ -270,7 +270,6 @@ sub findreversebuilddeps {
if ($#ARGV 0) { usage; exit(0); }
-Getopt::Long::Configure('bundling');
GetOptions(
u|update = \$opt_update,
s|sudo = \$opt_sudo,
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 223df33..0652edc 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -132,7 +132,7 @@ use feature 'switch';
use File::Copy qw(cp);
use File::Path qw(make_path);
use File::Basename;
-use Getopt::Long qw(:config require_order);
+use Getopt::Long qw(:config gnu_compat bundling require_order);
use Cwd qw(abs_path cwd);
use Dpkg::Version;
use Pod::Usage;
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index d6a79d7..647a712 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -21,7 +21,7 @@
# along with this program. If not, see http://www.gnu.org/licenses/.
use strict;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use File::Temp qw/tempfile/;
sub init_hashes;
diff --git a/scripts/dcontrol.pl b/scripts/dcontrol.pl
index e18909e..deac5c6 100755
--- a/scripts/dcontrol.pl
+++ b/scripts/dcontrol.pl
@@ -20,7 +20,7 @@
use strict;
use File::Basename;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
BEGIN {
# Load the URI::Escape and LWP::UserAgent modules safely
@@ -169,7 +169,6 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
}
# handle options
-Getopt::Long::Configure('bundling');
GetOptions(
d|debug = \$opt-{'debug'},
s|show-suite = \$opt-{'show-suite'},
diff --git a/scripts/dd-list.pl b/scripts/dd-list.pl
index f91bea8..ed77796 100755
--- a/scripts/dd-list.pl
+++ b/scripts/dd-list.pl
@@ -20,7 +20,7 @@
# along with this program. If not, see http://www.gnu.org/licenses/.
use strict;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
my $version='###VERSION###';
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 306445c..9f68276 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -35,7 +35,7 @@ use open ':utf8'; # changelogs are written with UTF-8
encoding
use filetest 'access'; # use access rather than stat for -w
# for checking whether user names are valid and making format() behave
use Encode qw/decode_utf8 encode_utf8/;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use File::Copy;
use File::Basename;
use Cwd;
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 6429863..6224427 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -223,7 +223,7 @@ Bdebcheckout and this manpage have been written by
Stefano Zacchiroli
use feature 'switch';
use strict;
use warnings;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use Pod::Usage;
use File::Basename;
use File::Copy qw/copy/;
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-8-g4b88af7
The following commit has been merged in the master branch: commit 4b88af76d53a4a38a653f8bbed721ebb339d9b55 Author: James Vega james...@debian.org Date: Thu Sep 22 21:02:51 2011 -0400 Add changelog entry for Paweł's licensecheck patch. Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index e754fad..88dc251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low When allowed, also use permute for full GNU getopt compatibility. + For shell scripts, use getopt instead of manual option parsing. - Update uses of getopt to show usage when getopt fails. + * licensecheck: Recognize more generated files. Thanks to Paweł Hajdan, Jr +for the patch. (Closes: #641497) -- Gerfried Fuchs rho...@debian.org Fri, 26 Aug 2011 21:09:51 +0200 -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-4-gf9b0d01
The following commit has been merged in the master branch:
commit f9b0d01949e798cb9ac9577cd269d580a94896a8
Author: James Vega james...@debian.org
Date: Tue Sep 20 21:05:27 2011 -0400
Remove support for PGP-style commands from debsign/debrsign.
Closes: #639204
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/NEWS b/debian/NEWS
index b22f9d7..4045edf 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,10 @@
+devscripts (2.11.2) UNRELEASED; urgency=low
+
+ Support for pgp-style commands has been removed from debsign/debrsign. As
+ such, the DEBSIGN_SIGNLIKE configuration variable has also been removed.
+
+ -- James Vega james...@debian.org Tue, 20 Sep 2011 20:53:10 -0400
+
devscripts (2.10.54) unstable; urgency=low
manpage-alert now, as originally intended, prints out the full path to the
diff --git a/debian/changelog b/debian/changelog
index 9ef8f2e..1b17ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ devscripts (2.11.2) UNRELEASED; urgency=low
* Remove the word of from the BSD 3 clause check, it might not be in
there.
+ [ James Vega ]
+ * Remove support for PGP-style commands from debsign/debrsign. (Closes:
+#639204)
++ DEBSIGN_SIGNLIKE config variable removed
+
-- Gerfried Fuchs rho...@debian.org Fri, 26 Aug 2011 21:09:51 +0200
devscripts (2.11.1) unstable; urgency=low
diff --git a/scripts/debsign.1 b/scripts/debsign.1
index b66632a..c8dd237 100644
--- a/scripts/debsign.1
+++ b/scripts/debsign.1
@@ -47,9 +47,8 @@ directory. \fBscp\fR will be used for the copying. The
permitted as an alternative. Wildcards (\fB*\fR etc.) are allowed.
.TP
.B \-p\fIprogname\fR
-\fIprogname\fR is one of \fBpgp\fR or \fBgpg\fR, and specifies which
-signing program is to be called. The default is \fBgpg\fR if
-\fI~/.gnupg/secring.gpg\fR exists and \fBpgp\fR otherwise.
+When \fBdebsign\fR needs to execute GPG to sign it will run \fIprogname\fR
+(searching the \fBPATH\fR if necessary), instead of gpg.
.TP
.B \-m\fImaintainer\fR
Specify the maintainer name to be used for signing. (See
@@ -67,10 +66,6 @@ Same as \fB\-m\fR but takes precedence over it.
Specify the key ID to be used for signing; overrides any \fB\-m\fR
and \fB\-e\fR options.
.TP
-\fB\-spgp\fR, \fB\-sgpg\fR
-Whether the signing program is to be called with command line
-arguments like those of \fBpgp\fR or \fBgpg\fR.
-.TP
\fB\-S\fR
Look for a source-only \fI.changes\fR file instead of a binary-build
changes file.
@@ -118,10 +113,6 @@ purpose. The currently recognised variables are:
.B DEBSIGN_PROGRAM
Setting this is equivalent to giving a \fB\-p\fR option.
.TP
-.B DEBSIGN_SIGNLIKE
-This must be \fIgpg\fR or \fIpgp\fR and is equivalent to using either
-\fB\-sgpg\fR or \fB\-spgp\fR respectively.
-.TP
.B DEBSIGN_MAINT
This is the \fB\-m\fR option.
.TP
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 0969bce..6030975 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -1,14 +1,12 @@
#! /bin/sh
-# This program is designed to PGP sign a .dsc and .changes file pair
+# This program is designed to GPG sign a .dsc and .changes file pair
# in the form needed for a legal Debian upload. It is based in part
# on dpkg-buildpackage. It takes one argument: the name of the
# .changes file. It also takes some options:
# -emaintainer Sign using key of maintainer (takes precedence over -m)
# -mmaintainer Sign using key of maintainer
-# -kkey The PGP/GPG key ID to use; overrides -m
-# -ptypetype is either pgp or gpg to specify which to use
-# -spgp,-sgpg The program takes arguments like pgp or gpg respectively
+# -kkey The GPG key ID to use; overrides -m
# -S Source-only .changes file
# -aarchDebian architecture
# -ttypeGNU machine type
@@ -79,8 +77,6 @@ usage () {
such a case
-kkeyid The key to use for signing
-psign-command The command to use for signing
--sgpg The sign-command is called like GPG
--spgp The sign-command is called like PGP
-emaintainer Sign using key of maintainer (takes precedence over -m)
-mmaintainer The same as -e
-S Use changes file made for source-only upload
@@ -176,37 +172,31 @@ signfile () {
ASCII_SIGNED_FILE=${UNSIGNED_FILE}.asc
(cat $1 ; echo ) $UNSIGNED_FILE
-if [ $signinterface = gpg ]
-then
- gpgversion=`gpg --version | head -n 1 | cut -d' ' -f3`
- gpgmajorversion=`echo $gpgversion | cut -d. -f1`
- gpgminorversion=`echo $gpgversion | cut -d. -f2`
+gpgversion=`$signcommand --version | head -n 1 | cut -d' ' -f3`
+gpgmajorversion=`echo $gpgversion | cut -d. -f1`
+gpgminorversion=`echo $gpgversion | cut -d. -f2`
- if [ $gpgmajorversion -gt 1 -o $gpgminorversion -ge 4 ]
- then
- $signcommand --local-user $2 --clearsign \
- --list-options no-show-policy-urls
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-5-gafe7def
The following commit has been merged in the master branch:
commit afe7def40f32d22a8c51c16c3e38a6f8a7de7a27
Author: James Vega james...@debian.org
Date: Tue Sep 20 21:14:42 2011 -0400
Doc updates for debsign/debrsign
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/debrsign.1 b/scripts/debrsign.1
index e1a839d..1a17131 100644
--- a/scripts/debrsign.1
+++ b/scripts/debrsign.1
@@ -46,7 +46,7 @@ use the most recent file with the name pattern
changes files produced by \fBdpkg-cross\fR.
.TP
\fB\-\-path \fIremote-path\fR
-Specify a path to the GPG or PGP binary on the remote host.
+Specify a path to the GPG binary on the remote host.
.TP
\fB\-\-help\fR, \fB\-\-version\fR
Show help message and version information respectively.
diff --git a/scripts/debrsign.sh b/scripts/debrsign.sh
index 9d3634e..2073ec0 100755
--- a/scripts/debrsign.sh
+++ b/scripts/debrsign.sh
@@ -10,18 +10,6 @@
# You should run this program from within the package directory on
# the build machine.
#
-# Usage: debrsign [options] [user@]remotehost [changes or dsc file]
-# You may also provide the following options, which will be passed
-# on to signchanges:
-# -mmaintainer Sign using key of maintainer
-# -kkey The PGP/GPG key ID to use; overrides -m
-# -ptypetype is either pgp or gpg to specify which to use
-# -spgp,-sgpg The program takes arguments like pgp or gpg respectively
-# -S Source-only .changes file
-# -aarchDebian architecture
-# -ttypeGNU machine type
-# --multi Search for multiarch .changes files
-# --help, --version
# Debian GNU/Linux debrsign.
# Copyright 1999 Mike Goldman, all rights reserved
@@ -50,8 +38,7 @@ usage () {
echo \
Usage: debrsign [options] [username@]remotehost [changes or dsc]
Options:
--sgpg, -spgpSign takes options like GPG, PGP respectively
--pgpg, -ppgpSign using GPG, PGP respectively
+-psign-command The command to use for signing
-emaintainer Sign using key of maintainer (takes precedence over -m)
-mmaintainer The same as -e
-kkeyid The key to use for signing
@@ -59,7 +46,7 @@ usage () {
-aarchUse changes file made for Debian target architecture arch
-ttarget Use changes file made for GNU target architecture target
--multi Use most recent multiarch .changes file found
---path Specify directory GPG/PGP binary is located on remote host
+--path Specify directory GPG binary is located on remote host
--help Show this message
--version Show version and copyright information
If a changes or dscfile is specified, it is signed, otherwise
diff --git a/scripts/debsign.1 b/scripts/debsign.1
index c8dd237..265363c 100644
--- a/scripts/debsign.1
+++ b/scripts/debsign.1
@@ -1,6 +1,6 @@
.TH DEBSIGN 1 Debian Utilities DEBIAN \ -*- nroff -*-
.SH NAME
-debsign \- sign a Debian changes and dsc file pair using GPG/PGP
+debsign \- sign a Debian changes and dsc file pair using GPG
.SH SYNOPSIS
\fBdebsign\fR [\fIoptions\fR]
[\fIchanges-file\fR|\fIdsc-file\fR|\fIcommands-file\fR ...]
.SH DESCRIPTION
@@ -9,7 +9,7 @@ debsign \- sign a Debian changes and dsc file pair using GPG/PGP
file or an unsigned \fI.changes\fR file (along with the associated
unsigned \fI.dsc\fR file found by replacing the architecture name and
\fI.changes\fR by \fI.dsc\fR if it appears in the \fI.changes\fR
-file), and signs them using the GNU Privacy Guard or PGP. It is
+file), and signs them using the GNU Privacy Guard. It is
careful to calculate the size and checksums of the newly signed
\fI.dsc\fR file and replace the original values in the \fI.changes\fR
file.
@@ -140,7 +140,6 @@ the option.
.BR sha1sum (1),
.BR sha256sum (1),
.BR gpg (1),
-.BR pgp (1),
.BR scp (1)
and
.BR devscripts.conf (5).
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 6030975..4ddba0f 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -3,17 +3,7 @@
# This program is designed to GPG sign a .dsc and .changes file pair
# in the form needed for a legal Debian upload. It is based in part
# on dpkg-buildpackage. It takes one argument: the name of the
-# .changes file. It also takes some options:
-# -emaintainer Sign using key of maintainer (takes precedence over -m)
-# -mmaintainer Sign using key of maintainer
-# -kkey The GPG key ID to use; overrides -m
-# -S Source-only .changes file
-# -aarchDebian architecture
-# -ttypeGNU machine type
-# --multi Search for multiarch .changes files
-# -r [username@]remotehost The changes (and dsc) files live on remotehost
-# --no-conf, --noconf Don't read configuration files
-# --help, --version
+# .changes file.
# Debian GNU/Linux debsign. Copyright (C) 1999 Julian Gilbey.
# Modifications to work with GPG by Joseph Carter and Julian Gilbey
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr
Bug#641818: bts subscribe does not work
On Sun, Sep 18, 2011 at 09:51:54AM +0200, Andreas Beckmann wrote: On 2011-09-17 14:57, James Vega wrote: == Processing commands for cont...@bugs.debian.org: subscribe 641344 There is no Debian Bug mailing list. If you wish to review bug reports please do so via http://www.debian.org/Bugs/ or ask this mail server to send them to you. soon: MAILINGLISTS_TEXT #other commands ... = Eventually treat this as a wishlist bug for control@ (and reopen/reassign/retitle/... in that case): forward the subscribe nnn [!|email] command to nnn-subscribe like the bts command would do, using [email] or [From:] as sender. If I'm understanding you right, then that would be a wishlist bug against debbugs, not devscripts. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#641818: bts subscribe does not work
On Fri, Sep 16, 2011 at 03:16:29PM +0200, Andreas Beckmann wrote: the command bts subscribe 123456 does not seem to work, I get no response at all. Using subscribe in a mail to control@ together with other commands results in the following error: (which isn't what bts does) == Processing commands for cont...@bugs.debian.org: subscribe 641344 There is no Debian Bug mailing list. If you wish to review bug reports please do so via http://www.debian.org/Bugs/ or ask this mail server to send them to you. soon: MAILINGLISTS_TEXT #other commands ... = But BTS(1) mentions subscribe bug [email] Subscribe the given email address to the specified bug report. If no email address is specified, ... Sending mail to 123456-subscribe@ does work. This is what bts does and I just confirmed that it works by running bts user devscri...@packages.debian.org . usertag 641818 bts . subscribe 641818 One email was sent (to control@) to modify the tags and another sent (to nnn-subscribe@) to subscribe me to the bug. I suggest taking a look at your mail log to see if that sheds some light on what's happening. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#640857: trivial bts efficiency discoveries
On Thu, Sep 08, 2011 at 07:13:17AM +0800, jida...@jidanni.org wrote: Examining the mail generated by $ bts reopen 636437 , found 636437 1.0.24.2-2 # cat -e /var/spool/exim4/input/1R1REl-XH-Ub-D 1R1REl-XH-Ub-D$ reopen 636437 $ found 636437 1.0.24.2-2$ thanks$ We note a trailing blank, and an unnecessary thanks. The thanks is how to signal the end of the control block. Yes, you can leave it off and the BTS will eventually ignore anything afterward, but what's the harm in including it? As for the trailing space, the code is clearer with the space than changing it to not have a space when there is no submitter specified. Also, again, what's the harm in the extra space? -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#639204: debsign: says Could not find a signing program when gpg does not have the requested key
On Mon, Aug 29, 2011 at 06:39:08PM +0100, Adam D. Barratt wrote: On Thu, 2011-08-25 at 01:26 +0200, Yann Dirson wrote: The message is quite misleading: $ debsign tulip_3.6.0dfsg-1_amd64.changes signfile tulip_3.6.0dfsg-1.dsc 5C33C1B8 It might be, but the problem isn't really what you suggest in the subject. $ mv ~/.gnupg/ ~/.gnupg.away $ debsign tulip_3.6.0dfsg-1_amd64.changes Could not find a signing program (pgp or gpg)! $ which gpg /usr/bin/gpg The test for gpg is: if [ \( -n $GNUPGHOME -a -e $GNUPGHOME \) -o -e $HOME/.gnupg ] \ command -v gpg /dev/null 21; then The result of your moving ~/.gnupg is that the first part of the test fails, so gpg is assumed not to be present. This appears to be a check for giving preference to gpg over pgp, but is it really necessary to even consider pgp? According to archive.debian.net, there hasn't ever been a package providing a pgp binary and the debian-keyring NEWS mentions that as of Dec. 2010 Debian doesn't use PGP keys anywhere anymore. I think changing it to check for the gpg or gpg2 commands only (no directory or environment variables) and providing an appropriate error message would be a good change. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-49-gb6f1a76
The following commit has been merged in the master branch: commit 4f9c66ace6c5748441051e42a315755eb3537791 Author: James Vega james...@debian.org Date: Mon Aug 22 23:15:32 2011 + Update chdist strings to ease translation. Signed-off-by: James Vega james...@debian.org diff --git a/scripts/chdist.pl b/scripts/chdist.pl index 1e03d56..223df33 100755 --- a/scripts/chdist.pl +++ b/scripts/chdist.pl @@ -58,33 +58,33 @@ Display version information. =item Bcreate IDIST [IURL IRELEASE ISECTIONS] -Prepares a new tree named IDIST +Prepare a new tree named IDIST =item Bapt-get IDIST Bupdate|Bsource|... -Runs Bapt-get inside IDIST +Run Bapt-get inside IDIST =item Bapt-cache IDIST Bshow|Bshowsrc|... -Runs Bapt-cache inside IDIST +Run Bapt-cache inside IDIST =item Bapt-rdepends IDIST [...] -Runs Bapt-rdepends inside IDIST +Run Bapt-rdepends inside IDIST =item Bsrc2bin IDIST SRCPKG -Lists binary packages for ISRCPKG in IDIST +List binary packages for ISRCPKG in IDIST =item Bbin2src IDIST BINPKG -Lists source package for IBINPKG in IDIST +List source package for IBINPKG in IDIST =item Bcompare-packages IDIST1 DIST2 [IDIST3, ...] =item Bcompare-bin-packages IDIST1 DIST2 [IDIST3, ...] -Lists versions of packages in several IDISTributions +List versions of packages in several IDISTributions =item Bcompare-versions IDIST1 DIST2 @@ -95,7 +95,7 @@ Bdpkg --compare-versions and display where the package is newer. =item Bcompare-src-bin-packages IDIST -Compares sources and binaries for IDIST +Compare sources and binaries for IDIST =item Bcompare-src-bin-versions IDIST @@ -104,15 +104,15 @@ and display where the package is newer =item Bgrep-dctrl-packages IDIST [...] -Runs Bgrep-dctrl on F*_Packages inside IDIST +Run Bgrep-dctrl on F*_Packages inside IDIST =item Bgrep-dctrl-sources IDIST [...] -Runs Bgrep-dctrl on F*_Sources inside IDIST +Run Bgrep-dctrl on F*_Sources inside IDIST =item Blist -Lists available IDISTs +List available IDISTs =back -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-49-gb6f1a76
The following commit has been merged in the master branch: commit 7a732b5cfdc5b05e2f2f079ea4a7f67912e64e96 Author: James Vega james...@debian.org Date: Mon Aug 22 23:38:51 2011 + po4a update Signed-off-by: James Vega james...@debian.org diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index bc719ed..4a33112 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: PACKAGE VERSION\n -POT-Creation-Date: 2011-07-29 01:53+\n +POT-Creation-Date: 2011-08-22 23:38+\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: LANGUAGE l...@li.org\n @@ -2550,7 +2550,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:61 -msgid Prepares a new tree named IDIST +msgid Prepare a new tree named IDIST msgstr #. type: =item @@ -2560,7 +2560,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:65 -msgid Runs Bapt-get inside IDIST +msgid Run Bapt-get inside IDIST msgstr #. type: =item @@ -2570,7 +2570,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:69 -msgid Runs Bapt-cache inside IDIST +msgid Run Bapt-cache inside IDIST msgstr #. type: =item @@ -2580,7 +2580,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:73 -msgid Runs Bapt-rdepends inside IDIST +msgid Run Bapt-rdepends inside IDIST msgstr #. type: =item @@ -2590,7 +2590,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:77 -msgid Lists binary packages for ISRCPKG in IDIST +msgid List binary packages for ISRCPKG in IDIST msgstr #. type: =item @@ -2600,7 +2600,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:81 -msgid Lists source package for IBINPKG in IDIST +msgid List source package for IBINPKG in IDIST msgstr #. type: =item @@ -2615,7 +2615,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:87 -msgid Lists versions of packages in several IDISTributions +msgid List versions of packages in several IDISTributions msgstr #. type: =item @@ -2642,7 +2642,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:98 -msgid Compares sources and binaries for IDIST +msgid Compare sources and binaries for IDIST msgstr #. type: =item @@ -2664,7 +2664,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:107 -msgid Runs Bgrep-dctrl on F*_Packages inside IDIST +msgid Run Bgrep-dctrl on F*_Packages inside IDIST msgstr #. type: =item @@ -2674,7 +2674,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:111 -msgid Runs Bgrep-dctrl on F*_Sources inside IDIST +msgid Run Bgrep-dctrl on F*_Sources inside IDIST msgstr #. type: =item @@ -2684,7 +2684,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:115 -msgid Lists available IDISTs +msgid List available IDISTs msgstr #. type: textblock diff --git a/po4a/po/fr.po b/po4a/po/fr.po index 2f714a4..eabb79a 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -12,7 +12,7 @@ msgid msgstr Project-Id-Version: devscripts\n -POT-Creation-Date: 2011-07-29 01:53+\n +POT-Creation-Date: 2011-08-22 23:38+\n PO-Revision-Date: 2011-07-28 22:11-0400\n Last-Translator: David Prévot da...@tilapin.org\n Language-Team: French debian-l10n-fre...@lists.debian.org\n @@ -3387,7 +3387,7 @@ msgstr #: ../scripts/chdist.pl:61 #, fuzzy #| msgid Bcreate IDIST : prepare a new tree named IDIST -msgid Prepares a new tree named IDIST +msgid Prepare a new tree named IDIST msgstr Bcreate IDIST : préparer une nouvelle arborescence nommée IDIST #. type: =item @@ -3403,8 +3403,10 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:65 -msgid Runs Bapt-get inside IDIST -msgstr +#, fuzzy +#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST +msgid Run Bapt-get inside IDIST +msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST #. type: =item #: ../scripts/chdist.pl:67 @@ -3419,8 +3421,10 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:69 -msgid Runs Bapt-cache inside IDIST -msgstr +#, fuzzy +#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST +msgid Run Bapt-cache inside IDIST +msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST #. type: =item #: ../scripts/chdist.pl:71 @@ -3433,7 +3437,7 @@ msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST #: ../scripts/chdist.pl:73 #, fuzzy #| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST -msgid Runs Bapt-rdepends inside IDIST +msgid Run Bapt-rdepends inside IDIST msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST #. type: =item @@ -3443,7 +3447,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:77 -msgid Lists binary packages for ISRCPKG in IDIST +msgid List binary packages for ISRCPKG in IDIST msgstr #. type: =item @@ -3453,7 +3457,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:81 -msgid Lists source package for IBINPKG in IDIST +msgid List source package
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-49-gb6f1a76
The following commit has been merged in the master branch: commit b6f1a768440d6bb4129cd2a7be7d970e098c6d5f Author: James Vega james...@debian.org Date: Mon Aug 22 19:51:28 2011 -0400 releasing version 2.11.1 diff --git a/debian/changelog b/debian/changelog index e80580a..12037d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -devscripts (2.11.1) UNRELEASED; urgency=low +devscripts (2.11.1) unstable; urgency=low [ David Prévot ] * Stylish manual pages convention review. (Closes: #628447) @@ -40,7 +40,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low * Support //scheme-local URLs in hrefs, correctly (as used by Google code) (Closes: #630808) - -- David Prévot taf...@debian.org Wed, 08 Jun 2011 12:16:32 -0400 + -- James Vega james...@debian.org Mon, 22 Aug 2011 19:51:03 -0400 devscripts (2.11.0) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-49-gb6f1a76
The following commit has been merged in the master branch: commit 663ef2bda55ae6045b6f2eba6785b577b7b3dc01 Author: James Vega james...@debian.org Date: Mon Aug 22 23:50:02 2011 + Update fr translation for chdist restructuring Signed-off-by: James Vega james...@debian.org diff --git a/po4a/po/fr.po b/po4a/po/fr.po index eabb79a..fd0118d 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -13,7 +13,7 @@ msgid msgstr Project-Id-Version: devscripts\n POT-Creation-Date: 2011-08-22 23:38+\n -PO-Revision-Date: 2011-07-28 22:11-0400\n +PO-Revision-Date: 2011-08-22 23:48+\n Last-Translator: David Prévot da...@tilapin.org\n Language-Team: French debian-l10n-fre...@lists.debian.org\n Language: fr\n @@ -3385,65 +3385,43 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:61 -#, fuzzy -#| msgid Bcreate IDIST : prepare a new tree named IDIST msgid Prepare a new tree named IDIST -msgstr Bcreate IDIST : préparer une nouvelle arborescence nommée IDIST +msgstr Préparer une nouvelle arborescence nommée IDIST #. type: =item #: ../scripts/chdist.pl:63 -#, fuzzy -#| msgid -#| Bapt-get IDIST (Bupdate|Bsource|...) : run Bapt-get inside -#| IDIST msgid Bapt-get IDIST Bupdate|Bsource|... -msgstr -Bapt-get IDIST (Bupdate|Bsource|...) : exécuter Bapt-get dans -IDIST +msgstr Bapt-get IDIST Bupdate|Bsource|... #. type: textblock #: ../scripts/chdist.pl:65 -#, fuzzy -#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST msgid Run Bapt-get inside IDIST -msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST +msgstr Exécuter Bapt-get dans IDIST #. type: =item #: ../scripts/chdist.pl:67 -#, fuzzy -#| msgid -#| Bapt-cache IDIST (Bshow|Bshowsrc|...) : run Bapt-cache inside -#| IDIST msgid Bapt-cache IDIST Bshow|Bshowsrc|... -msgstr -Bapt-cache IDIST (Bshow|Bshowsrc|...) : exécuter Bapt-cache dans -IDIST +msgstr Bapt-cache IDIST Bshow|Bshowsrc|... #. type: textblock #: ../scripts/chdist.pl:69 -#, fuzzy -#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST msgid Run Bapt-cache inside IDIST -msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST +msgstr Exécuter Bapt-cache dans IDIST #. type: =item #: ../scripts/chdist.pl:71 -#, fuzzy -#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST msgid Bapt-rdepends IDIST [...] -msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST +msgstr Bapt-rdepends IDIST [...] #. type: textblock #: ../scripts/chdist.pl:73 -#, fuzzy -#| msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST msgid Run Bapt-rdepends inside IDIST -msgstr Bapt-rdepends IDIST [...] : exécuter Bapt-rdepends dans IDIST +msgstr Exécuter Bapt-rdepends dans IDIST #. type: =item #: ../scripts/chdist.pl:75 msgid Bsrc2bin IDIST SRCPKG -msgstr +msgstr Bsrc2bin IDIST SRCPKG #. type: textblock #: ../scripts/chdist.pl:77 @@ -3453,7 +3431,7 @@ msgstr #. type: =item #: ../scripts/chdist.pl:79 msgid Bbin2src IDIST BINPKG -msgstr +msgstr Bbin2src IDIST BINPKG #. type: textblock #: ../scripts/chdist.pl:81 @@ -3472,14 +3450,8 @@ msgstr Bcompare-bin-packages IDIST1 DIST2 [IDIST3, ...] #. type: textblock #: ../scripts/chdist.pl:87 -#, fuzzy -#| msgid -#| Bcompare-packages IDIST1 DIST2 [IDIST3, ...] : list versions of -#| packages in several IDISTributions msgid List versions of packages in several IDISTributions -msgstr -Bcompare-packages IDIST1 DIST2 [IDIST3, ...] : lister les versions de -paquets de plusieurs IDISTributions +msgstr Lister les versions de paquets de plusieurs IDISTributions #. type: =item #: ../scripts/chdist.pl:89 @@ -3508,14 +3480,8 @@ msgstr Bcompare-src-bin-packages IDIST #. type: textblock #: ../scripts/chdist.pl:98 -#, fuzzy -#| msgid -#| Bcompare-src-bin-packages IDIST : compare sources and binaries for -#| IDIST msgid Compare sources and binaries for IDIST -msgstr -Bcompare-src-bin-packages IDIST : comparer les sources et binaires de -IDIST +msgstr Comparer les sources et binaires de IDIST #. type: =item #: ../scripts/chdist.pl:100 @@ -3538,14 +3504,8 @@ msgstr Bgrep-dctrl-packages IDIST [...] #. type: textblock #: ../scripts/chdist.pl:107 -#, fuzzy -#| msgid -#| Bgrep-dctrl-packages IDIST [...] : run Bgrep-dctrl on F*_Packages -#| inside IDIST msgid Run Bgrep-dctrl on F*_Packages inside IDIST -msgstr -Bgrep-dctrl-packages IDIST [...] : exécuter Bgrep-dctrl sur tous les -fichiers F*_Packages de IDIST +msgstr Exécuter Bgrep-dctrl sur tous les fichiers F*_Packages de IDIST #. type: =item #: ../scripts/chdist.pl:109 @@ -3554,14 +3514,8 @@ msgstr Bgrep-dctrl-sources IDIST [...] #. type: textblock #: ../scripts/chdist.pl:111 -#, fuzzy -#| msgid -#| Bgrep-dctrl-sources IDIST [...] : run Bgrep-dctrl on F*_Sources -#| inside IDIST msgid Run Bgrep-dctrl on F*_Sources inside IDIST -msgstr -Bgrep-dctrl-sources IDIST [...] : exécuter Bgrep-dctrl sur tous les -fichiers F*_Sources de IDIST +msgstr
[SCM] Git repository for devscripts annotated tag, v2.11.1, created. v2.11.1
The annotated tag, v2.11.1 has been created at 03fd03f0162461703cd75351984b7c2bd6840b0b (tag) tagging b6f1a768440d6bb4129cd2a7be7d970e098c6d5f (commit) replaces v2.11.0 tagged by James Vega on Mon Aug 22 19:52:34 2011 -0400 - Shortlog tagging version 2.11.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk5S68IACgkQDb3UpmEybUCxAQCglg6MHocDDb0bXF0bLPEV0ySU AooAoIWPGWX1o6OVafhPHW/q3X8i+mLk =S/HC -END PGP SIGNATURE- Adam D. Barratt (1): debian/copyright: Update repository information somewhat belatedly for the move to git. Benjamin Drung (1): Update debian/changelog. Christian Kastner (1): Fix --destdir regression when repacking ZIP files Christoph Berg (4): dscextract: new script, extracts a single file from a Debian source package. debcheckout: When retrieving the source for debian/-only repositories, move all .dsc components to the current directory, not just .orig.tar.gz. uscan: Catch perl warning with incorrect watch files without (). Also, catch warnings on non-matches of ()? constructs. David Prévot (12): Bug#628447: [PATCH] Stylish manual pages convention review Handle the last description in devscripts(1) po4a: Handle translation of newly added manpages (fr) Translation update (and partial review) 2262t Handle translated manpage symlinks po4a: POT update (fr) Proofread translation [ Cédric Boutillier ] po4a: POT update; fr.po: 2262t5f9u (fr) Translation update 2276t Update translation credits po4a: POT update; fr.po: 2276t4f6u (fr) Translation update 2286t James Vega (28): debchange: Remove dapper from the list of recognized distributions. debcheckout: Handle Alioth's new anonymous access URLs debsnap: Allow -a to be specified multiple times. Changelog entry for genmanpage fix Remove svn-deblayout, vestiges from svn-buildpackage days. Add changelog entry for uscan --destdir fix. mergechanges: Do not drop fields in merged file. debuild: Call dpkg-source --before-build/--after-build Merge remote-tracking branch 'origin/master' chdist: Make the help more explicit chdist: Reformat POD and use pod2usage for usage() chdist: Route apt commands through a central aptcmd function chdist: Create required directories under /etc/apt chdist: Perform filtering in chdist instead of through shell pipelines chdist: Use newest binary version, when multiple exist, for compare-src-bin-*. chdist: Fix the prototype for dist_compare chdist: Consistently use fatal() instead of die. chdist: Copy archive keyrings to etc/apt/trusted.gpg.d Merge remote-tracking branch 'origin/master' scripts/Makefile: VERSION_FILE target now actually builds the version file po4a update Update trivial fr translations chdist: Redefine Pod::Text's cmd_i to produce cleaner --help output Merge remote-tracking branch 'origin/master' Update chdist strings to ease translation. po4a update Update fr translation for chdist restructuring releasing version 2.11.1 Stefano Rivera (1): Support //scheme-local URLs in hrefs, correctly (as used by Google code) (Closes: #630808) Timo Juhani Lindfors (1): debsnap: add EXAMPLES section to man page. --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#633577: devscripts: add mentorsget scripts
On Mon, Jul 11, 2011 at 09:49:51PM +0200, Paul Wise wrote: Please add the attached mentorsget script that can be used to easily download multiple source packages from mentors.debian.net to the current directory using apt-get source and a temporary location for the sources.list and apt bits. Couldn't the same be achieved with chdist? $ chdist create mentors http://mentors.debian.net/debian unstable main contrib non-free Run chdist apt-get mentors update And enjoy. $ chdist apt-get mentors update … $ chdist apt-get mentors source … Note that you'll want to wait until Devscripts 2.11.1 hits your mirror since I overhauled chdist. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-44-g3d9a39f
The following commit has been merged in the master branch: commit 3d9a39fb631f242a477be23416e48d45d7383fb7 Merge: faa1548d4165a368cf7125cf8d3ee82e23fa0aff 7b64088da77155e043d161c5abac94525cba91c8 Author: James Vega james...@debian.org Date: Mon Aug 8 21:07:16 2011 -0400 Merge remote-tracking branch 'origin/master' -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-44-g3d9a39f
The following commit has been merged in the master branch:
commit faa1548d4165a368cf7125cf8d3ee82e23fa0aff
Author: James Vega james...@debian.org
Date: Mon Aug 8 21:05:53 2011 -0400
chdist: Redefine Pod::Text's cmd_i to produce cleaner --help output
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 300ad73..1e03d56 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -137,6 +137,15 @@ use Cwd qw(abs_path cwd);
use Dpkg::Version;
use Pod::Usage;
+# Redefine Pod::Text's cmd_i so pod2usage converts I... to ... instead of
+# *...*
+{
+package Pod::Text;
+no warnings qw(redefine);
+
+sub cmd_i { ''. $_[2] . '' }
+}
+
my $progname = basename($0);
sub usage {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-40-g0bb455a
The following commit has been merged in the master branch: commit 073d4ec257e028020a75e88f00f2056acc8de7e3 Author: James Vega james...@debian.org Date: Thu Jul 28 21:47:53 2011 -0400 scripts/Makefile: VERSION_FILE target now actually builds the version file Signed-off-by: James Vega james...@debian.org diff --git a/scripts/Makefile b/scripts/Makefile index 2cee7bd..91066f6 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -27,8 +27,7 @@ BIN_LIBDIR = /usr/lib/devscripts all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION) $(VERSION_FILE): - @echo You need to 'make' the toplevel directory first - @false + $(MAKE) -C .. version %: %.sh @@ -53,7 +52,7 @@ $(VERSION_FILE): # from ../po4a/Makefile. Treat files with care. PID := $(shell echo -$$PPID) devscripts.1: devscripts.1.in - cat $+ $@.$(PID) + cat $ $@.$(PID) perl ../debian/genmanpage.pl $@.$(PID) mv $@.$(PID) $@ -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-40-g0bb455a
The following commit has been merged in the master branch: commit 919890ebcfcd86f119f00b24b82df21808da101d Author: James Vega james...@debian.org Date: Thu Jul 28 21:58:45 2011 -0400 po4a update Signed-off-by: James Vega james...@debian.org diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index 951502b..bc719ed 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: PACKAGE VERSION\n -POT-Creation-Date: 2011-07-08 18:09-0400\n +POT-Creation-Date: 2011-07-29 01:53+\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: LANGUAGE l...@li.org\n @@ -2302,7 +2302,7 @@ msgid reportbug(1), querybts(1) msgstr #. type: =head1 -#: ../scripts/bts.pl:4102 ../scripts/chdist.pl:91 ../scripts/debsnap.1:126 ../scripts/mass-bug.pl:513 ../scripts/tagpending.pl:431 +#: ../scripts/bts.pl:4102 ../scripts/chdist.pl:119 ../scripts/debsnap.1:126 ../scripts/mass-bug.pl:513 ../scripts/tagpending.pl:431 #, no-wrap msgid COPYRIGHT msgstr @@ -2317,7 +2317,7 @@ msgid msgstr #. type: textblock -#: ../scripts/bts.pl:4109 ../scripts/chdist.pl:96 ../scripts/mass-bug.pl:517 +#: ../scripts/bts.pl:4109 ../scripts/chdist.pl:124 ../scripts/mass-bug.pl:517 msgid It is licensed under the terms of the GPL, either version 2 of the License, or (at your option) any later version. @@ -2525,7 +2525,7 @@ msgstr #. type: textblock #: ../scripts/chdist.pl:43 -msgid Choose data directory (default: $HOME/.chdist/). +msgid Choose data directory (default: F$HOME/.chdist/). msgstr #. type: =item @@ -2545,97 +2545,151 @@ msgstr #. type: =item #: ../scripts/chdist.pl:59 -msgid Bcreate IDIST : prepare a new tree named IDIST +msgid Bcreate IDIST [IURL IRELEASE ISECTIONS] msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:61 -msgid Bapt-get IDIST (Bupdate|Bsource|...) : run Bapt-get inside IDIST +msgid Prepares a new tree named IDIST msgstr #. type: =item #: ../scripts/chdist.pl:63 -msgid -Bapt-cache IDIST (Bshow|Bshowsrc|...) : run Bapt-cache inside -IDIST +msgid Bapt-get IDIST Bupdate|Bsource|... msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:65 -msgid Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST +msgid Runs Bapt-get inside IDIST msgstr #. type: =item #: ../scripts/chdist.pl:67 -msgid Bsrc2bin IDIST PKG : get binary packages for a source package in IDIST +msgid Bapt-cache IDIST Bshow|Bshowsrc|... msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:69 -msgid Bbin2src IDIST PKG : get source package for a binary package in IDIST +msgid Runs Bapt-cache inside IDIST msgstr #. type: =item #: ../scripts/chdist.pl:71 -msgid -Bcompare-packages IDIST1 DIST2 [IDIST3, ...] : list versions of -packages in several IDISTributions +msgid Bapt-rdepends IDIST [...] msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:73 -msgid Bcompare-bin-packages IDIST1 DIST2 [IDIST3, ...] +msgid Runs Bapt-rdepends inside IDIST msgstr #. type: =item #: ../scripts/chdist.pl:75 -msgid -Bcompare-versions IDIST1 DIST2 : same as Bcompare-packages, but also -run Bdpkg --compare-versions and display where the package is newer. +msgid Bsrc2bin IDIST SRCPKG msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:77 -msgid Bcompare-bin-versions IDIST1 DIST2 +msgid Lists binary packages for ISRCPKG in IDIST msgstr #. type: =item #: ../scripts/chdist.pl:79 -msgid -Bcompare-src-bin-packages IDIST : compare sources and binaries for -IDIST +msgid Bbin2src IDIST BINPKG msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:81 -msgid -Bcompare-src-bin-versions IDIST : same as Bcompare-src-bin-versions, -but also run Idpkg --compare-versions and display where the package is -newer +msgid Lists source package for IBINPKG in IDIST msgstr #. type: =item #: ../scripts/chdist.pl:83 -msgid -Bgrep-dctrl-packages IDIST [...] : run Bgrep-dctrl on F*_Packages -inside IDIST +msgid Bcompare-packages IDIST1 DIST2 [IDIST3, ...] msgstr #. type: =item #: ../scripts/chdist.pl:85 -msgid -Bgrep-dctrl-sources IDIST [...] : run Bgrep-dctrl on F*_Sources -inside IDIST +msgid Bcompare-bin-packages IDIST1 DIST2 [IDIST3, ...] msgstr -#. type: =item +#. type: textblock #: ../scripts/chdist.pl:87 -msgid Blist : list available IDISTs +msgid Lists versions of packages in several IDISTributions +msgstr + +#. type: =item +#: ../scripts/chdist.pl:89 +msgid Bcompare-versions IDIST1 DIST2 +msgstr + +#. type: =item +#: ../scripts/chdist.pl:91 +msgid Bcompare-bin-versions IDIST1 DIST2 msgstr #. type: textblock #: ../scripts/chdist.pl:93 msgid +Same as Bcompare-packages/Bcompare-bin-packages, but also runs Bdpkg +--compare-versions and display where the package is newer. +msgstr + +#. type: =item +#: ../scripts/chdist.pl:96 +msgid Bcompare-src-bin-packages IDIST
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch: commit d07ec5ae758f61402fa075f4faae2dc78094c9f8 Author: James Vega james...@debian.org Date: Thu Jul 21 21:55:57 2011 -0400 chdist: Make the help more explicit Signed-off-by: James Vega james...@debian.org diff --git a/scripts/chdist.pl b/scripts/chdist.pl index af2ffb8..0d4faff 100755 --- a/scripts/chdist.pl +++ b/scripts/chdist.pl @@ -56,17 +56,17 @@ Display version information. =over 4 -=item Bcreate IDIST : prepare a new tree named IDIST +=item Bcreate IDIST [IURL IRELEASE ISECTIONS] : prepare a new tree named IDIST -=item Bapt-get IDIST (Bupdate|Bsource|...) : run Bapt-get inside IDIST +=item Bapt-get IDIST Bupdate|Bsource|... : run Bapt-get inside IDIST -=item Bapt-cache IDIST (Bshow|Bshowsrc|...) : run Bapt-cache inside IDIST +=item Bapt-cache IDIST Bshow|Bshowsrc|... : run Bapt-cache inside IDIST =item Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST -=item Bsrc2bin IDIST PKG : get binary packages for a source package in IDIST +=item Bsrc2bin IDIST SRCPKG : get binary packages for ISRCPKG in IDIST -=item Bbin2src IDIST PKG : get source package for a binary package in IDIST +=item Bbin2src IDIST BINPKG : get source package for IBINPKG in IDIST =item Bcompare-packages IDIST1 DIST2 [IDIST3, ...] : list versions of packages in several IDISTributions @@ -78,7 +78,7 @@ Display version information. =item Bcompare-src-bin-packages IDIST : compare sources and binaries for IDIST -=item Bcompare-src-bin-versions IDIST : same as Bcompare-src-bin-versions, but also run Idpkg --compare-versions and display where the package is newer +=item Bcompare-src-bin-versions IDIST : same as Bcompare-src-bin-versions, but also run Bdpkg --compare-versions and display where the package is newer =item Bgrep-dctrl-packages IDIST [...] : run Bgrep-dctrl on F*_Packages inside IDIST -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 7444699629ca28c814d0285fe66872f86d1e587d
Author: James Vega james...@debian.org
Date: Tue Jul 26 07:26:28 2011 -0400
chdist: Reformat POD and use pod2usage for usage()
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 0d4faff..d307e43 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -40,7 +40,7 @@ Provide a usage message.
=item B-d, B--data-dir IDIR
-Choose data directory (default: $HOME/.chdist/).
+Choose data directory (default: F$HOME/.chdist/).
=item B-a, B--arch IARCH
@@ -56,35 +56,63 @@ Display version information.
=over 4
-=item Bcreate IDIST [IURL IRELEASE ISECTIONS] : prepare a new tree
named IDIST
+=item Bcreate IDIST [IURL IRELEASE ISECTIONS]
-=item Bapt-get IDIST Bupdate|Bsource|... : run Bapt-get inside
IDIST
+Prepares a new tree named IDIST
-=item Bapt-cache IDIST Bshow|Bshowsrc|... : run Bapt-cache inside
IDIST
+=item Bapt-get IDIST Bupdate|Bsource|...
-=item Bapt-rdepends IDIST [...] : run Bapt-rdepends inside IDIST
+Runs Bapt-get inside IDIST
-=item Bsrc2bin IDIST SRCPKG : get binary packages for ISRCPKG in IDIST
+=item Bapt-cache IDIST Bshow|Bshowsrc|...
-=item Bbin2src IDIST BINPKG : get source package for IBINPKG in IDIST
+Runs Bapt-cache inside IDIST
-=item Bcompare-packages IDIST1 DIST2 [IDIST3, ...] : list versions of
packages in several IDISTributions
+=item Bapt-rdepends IDIST [...]
+
+Runs Bapt-rdepends inside IDIST
+
+=item Bsrc2bin IDIST SRCPKG
+
+Lists binary packages for ISRCPKG in IDIST
+
+=item Bbin2src IDIST BINPKG
+
+Lists source package for IBINPKG in IDIST
+
+=item Bcompare-packages IDIST1 DIST2 [IDIST3, ...]
=item Bcompare-bin-packages IDIST1 DIST2 [IDIST3, ...]
-=item Bcompare-versions IDIST1 DIST2 : same as Bcompare-packages, but
also run Bdpkg --compare-versions and display where the package is newer.
+Lists versions of packages in several IDISTributions
+
+=item Bcompare-versions IDIST1 DIST2
=item Bcompare-bin-versions IDIST1 DIST2
-=item Bcompare-src-bin-packages IDIST : compare sources and binaries for
IDIST
+Same as Bcompare-packages/Bcompare-bin-packages, but also runs
+Bdpkg --compare-versions and display where the package is newer.
-=item Bcompare-src-bin-versions IDIST : same as
Bcompare-src-bin-versions, but also run Bdpkg --compare-versions and
display where the package is newer
+=item Bcompare-src-bin-packages IDIST
-=item Bgrep-dctrl-packages IDIST [...] : run Bgrep-dctrl on
F*_Packages inside IDIST
+Compares sources and binaries for IDIST
-=item Bgrep-dctrl-sources IDIST [...] : run Bgrep-dctrl on F*_Sources
inside IDIST
+=item Bcompare-src-bin-versions IDIST
-=item Blist : list available IDISTs
+Same as Bcompare-src-bin-packages, but also run Bdpkg --compare-versions
+and display where the package is newer
+
+=item Bgrep-dctrl-packages IDIST [...]
+
+Runs Bgrep-dctrl on F*_Packages inside IDIST
+
+=item Bgrep-dctrl-sources IDIST [...]
+
+Runs Bgrep-dctrl on F*_Sources inside IDIST
+
+=item Blist
+
+Lists available IDISTs
=back
@@ -104,39 +132,14 @@ use File::Basename;
use Getopt::Long qw(:config require_order);
use Cwd qw(abs_path cwd);
use Dpkg::Version;
+use Pod::Usage;
my $progname = basename($0);
sub usage {
- return EOF;
-Usage: chdist [options] [command] [command parameters]
-
-Options:
--h, --help Show this help
--d, --data-dir DIR Choose data directory (default:
\$HOME/.chdist/)
--a, --arch ARCH Choose architecture (default: `dpkg
--print-architecture`)
--v, --versionDisplay version and copyright information
-
-Commands:
- create DIST : prepare a new tree named DIST
- apt-get DIST (update|source|...) : run apt-get inside DIST
- apt-cache DIST (show|showsrc|...) : run apt-cache inside DIST
- apt-rdepends DIST [...] : run apt-rdepends inside DIST
- src2bin DIST PKG : get binary packages for a source package in DIST
- bin2src DIST PKG : get source package for a binary package in DIST
- compare-packages DIST1 DIST2 [DIST3, ...] : list versions of packages in
- several DISTributions
- compare-bin-packages DIST1 DIST2 [DIST3, ...]
- compare-versions DIST1 DIST2 : same as compare-packages, but also run
- dpkg --compare-versions and display where the package is newer
- compare-bin-versions DIST1 DIST2
- compare-src-bin-packages DIST : compare sources and binaries for DIST
- compare-src-bin-versions DIST : same as compare-src-bin-versions, but also
- run dpkg --compare-versions and display where the package is newer
- grep-dctrl-packages DIST [...] : run grep-dctrl on *_Packages inside DIST
- grep-dctrl-sources DIST [...] : run grep-dctrl on *_Sources inside DIST
- list : list available DISTs
-EOF
+pod2usage(-verbose = 99,
+ -exitval = $_[0],
+ -sections = 'SYNOPSIS|OPTIONS|ARGUMENTS|COMMANDS
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 12a5b75b2cfe10e4e0d43ef3c77d28f45eb97582
Author: James Vega james...@debian.org
Date: Wed Jul 27 07:30:21 2011 -0400
chdist: Route apt commands through a central aptcmd function
The new aptcmd function handles setting up the APT_CONFIG environment
variable, setting the Apt::Architecture option (when necessary), and
exec()ing
the specific apt command being used.
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index d307e43..8a2e6f9 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -128,6 +128,7 @@ License, or (at your option) any later version.
use strict;
use warnings;
+use feature 'switch';
use File::Basename;
use Getopt::Long qw(:config require_order);
use Cwd qw(abs_path cwd);
@@ -183,6 +184,13 @@ if ($version) {
### Functions
+sub fatal
+{
+my ($msg) = @_;
+print STDERR $progname: $msg;
+exit 1;
+}
+
sub uniq (@) {
my %hash;
map { $hash{$_}++ == 0 ? $_ : () } @_;
@@ -207,50 +215,38 @@ sub type_check {
}
}
-sub aptopts {
- # Build apt options
- my ($dist) = @_;
- my $opts = ;
- if ($arch) {
- print W: Forcing arch $arch for this command only.\n;
- $opts .= -o Apt::Architecture=$arch;
- }
- return $opts;
+sub aptopts
+{
+# Build apt options
+my ($dist) = @_;
+my @opts = ();
+if ($arch) {
+ print W: Forcing arch $arch for this command only.\n;
+ push(@opts, '-o', Apt::Architecture=$arch);
+}
+return @opts;
}
-sub aptconfig {
- # Build APT_CONFIG override
- my ($dist) = @_;
- return APT_CONFIG=$datadir/$dist/etc/apt/apt.conf;
+sub aptconfig
+{
+# Build APT_CONFIG override
+my ($dist) = @_;
+my $aptconf = $datadir/$dist/etc/apt/apt.conf;
+if (! -r $aptconf) {
+ fatal(Unable to read $aptconf);
+}
+$ENV{'APT_CONFIG'} = $aptconf;
}
###
-sub aptcache {
- # Run apt-cache cmd
- my ($dist, @args) = @_;
- dist_check($dist);
- my $args = aptopts($dist) . @args;
- my $aptconfig = aptconfig($dist);
- system($aptconfig /usr/bin/apt-cache $args);
-}
-
-sub aptget {
- # Run apt-get cmd
- my ($dist, @args) = @_;
- dist_check($dist);
- my $args = aptopts($dist) . @args;
- my $aptconfig = aptconfig($dist);
- system($aptconfig /usr/bin/apt-get $args);
-}
-
-sub aptrdepends {
- # Run apt-rdepends cmd
- my ($dist, @args) = @_;
- dist_check($dist);
- my $args = aptopts($dist) . @args;
- my $aptconfig = aptconfig($dist);
- system($aptconfig /usr/bin/apt-rdepends $args);
+sub aptcmd
+{
+my ($cmd, $dist, @args) = @_;
+dist_check($dist);
+unshift(@args, aptopts($dist));
+aptconfig($dist);
+exec($cmd, @args);
}
sub bin2src {
@@ -630,51 +626,53 @@ sub parseFile {
my $command = shift @ARGV;
-if ($command eq 'create') {
- dist_create(@ARGV);
-}
-elsif ($command eq 'apt-get') {
- aptget(@ARGV);
-}
-elsif ($command eq 'apt-cache') {
- aptcache(@ARGV);
-}
-elsif ($command eq 'apt-rdepends') {
- aptrdepends(@ARGV);
-}
-elsif ($command eq 'bin2src') {
- bin2src(@ARGV);
-}
-elsif ($command eq 'src2bin') {
- src2bin(@ARGV);
-}
-elsif ($command eq 'compare-packages') {
- dist_compare(@ARGV, 0, 'Sources');
-}
-elsif ($command eq 'compare-bin-packages') {
- dist_compare(@ARGV, 0, 'Packages');
-}
-elsif ($command eq 'compare-versions') {
- dist_compare(@ARGV, 1, 'Sources');
-}
-elsif ($command eq 'compare-bin-versions') {
- dist_compare(@ARGV, 1, 'Packages');
-}
-elsif ($command eq 'grep-dctrl-packages') {
- grep_file(@ARGV, 'Packages');
-}
-elsif ($command eq 'grep-dctrl-sources') {
- grep_file(@ARGV, 'Sources');
-}
-elsif ($command eq 'compare-src-bin-packages') {
- compare_src_bin(@ARGV, 0);
-}
-elsif ($command eq 'compare-src-bin-versions') {
- compare_src_bin(@ARGV, 1);
-}
-elsif ($command eq 'list') {
- list;
-}
-else {
- die Command unknown. Try $0 -h\n;
+given ($command) {
+when ('create') {
+ dist_create(@ARGV);
+}
+when ('apt-get') {
+ aptcmd('apt-get', @ARGV);
+}
+when ('apt-cache') {
+ aptcmd('apt-cache', @ARGV);
+}
+when ('apt-rdepends') {
+ aptcmd('apt-rdepends', @ARGV);
+}
+when ('bin2src') {
+ bin2src(@ARGV);
+}
+when ('src2bin') {
+ src2bin(@ARGV);
+}
+when ('compare-packages') {
+ dist_compare(@ARGV, 0, 'Sources');
+}
+when ('compare-bin-packages') {
+ dist_compare(@ARGV, 0, 'Packages');
+}
+when ('compare-versions') {
+ dist_compare(@ARGV, 1, 'Sources');
+}
+when ('compare-bin-versions') {
+ dist_compare(@ARGV, 1, 'Packages');
+}
+when ('grep-dctrl-packages') {
+ grep_file(@ARGV, 'Packages');
+}
+when ('grep-dctrl-sources') {
+ grep_file(@ARGV, 'Sources');
+}
+when ('compare-src-bin
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 5d76f8867088e903c26afd50de30170085073afe
Author: James Vega james...@debian.org
Date: Wed Jul 27 21:50:28 2011 -0400
chdist: Create required directories under /etc/apt
Closes: #528274, LP: #566682
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 5e31fcc..da4a08e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
at the end of the source files. (Closes: #625620)
* debuild: Call dpkg-source --before-build/--after-build when emulating
dpkg-buildpackage. (Closes: #628481)
+ * chdist: Create /etc/apt/apt.conf.d and /etc/apt/preferences.d in the
+chdist directory structure. (Closes: #528274, LP: #566682)
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 8a2e6f9..cb9c27d 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -129,6 +129,7 @@ License, or (at your option) any later version.
use strict;
use warnings;
use feature 'switch';
+use File::Path qw(make_path);
use File::Basename;
use Getopt::Long qw(:config require_order);
use Cwd qw(abs_path cwd);
@@ -277,51 +278,39 @@ sub src2bin {
print join \n, @bins;
}
+sub dist_create
+{
+my ($dist, $method, $version, @sections) = @_;
+if (!defined($dist)) {
+ fatal(you must provide a dist name.);
+}
+my $dir = $datadir/$dist;
+if (-d $dir) {
+ fatal($dir already exists, exiting.);
+}
+make_path($datadir);
+foreach my $d (('/etc/apt', '/etc/apt/apt.conf.d',
'/etc/apt/preferences.d',
+ '/var/lib/apt/lists/partial',
'/var/cache/apt/archives/partial',
+ '/var/lib/dpkg')) {
+ make_path($dir/$d);
+}
-sub recurs_mkdir {
- my ($dir) = @_;
- my @temp = split /\//, $dir;
- my $createdir = ;
- foreach my $piece (@temp) {
- $createdir .= /$piece;
- if (! -d $createdir) {
-mkdir($createdir);
- }
- }
-}
-
-sub dist_create {
- my ($dist, $method, $version, @sections) = @_;
- my $dir = $datadir . '/' . $dist;
- if ( ! $dist ) {
- die E: you must provide a dist name.\n;
- }
- if (-d $dir) {
-die E: $dir already exists, exiting.\n;
- }
- if (! -d $datadir) {
-mkdir($datadir);
- }
- mkdir($dir);
- foreach my $d (('/etc/apt', '/var/lib/apt/lists/partial', '/var/lib/dpkg',
'/var/cache/apt/archives/partial')) {
- recurs_mkdir($dir/$d);
- }
-
- # Create sources.list
- open(FH, $dir/etc/apt/sources.list);
- if ($version) {
- # Use provided method, version and sections
- my $sections_str = join(' ', @sections);
- print FH EOF;
+# Create sources.list
+open(FH, '', $dir/etc/apt/sources.list);
+if ($version) {
+ # Use provided method, version and sections
+ my $sections_str = join(' ', @sections);
+ print FH EOF;
deb $method $version $sections_str
deb-src $method $version $sections_str
EOF
- } else {
- if ($method) {
-warn W: method provided without a section. Using default content for
sources.list\n;
- }
- # Fill in sources.list with example contents
- print FH EOF;
+}
+else {
+ if ($method) {
+ warn W: method provided without a section. Using default content
for sources.list\n;
+ }
+ # Fill in sources.list with example contents
+ print FH EOF;
#deb http://ftp.debian.org/debian/ unstable main contrib non-free
#deb-src http://ftp.debian.org/debian/ unstable main contrib non-free
@@ -330,27 +319,27 @@ EOF
#deb-src http://archive.ubuntu.com/ubuntu dapper main restricted
#deb-src http://archive.ubuntu.com/ubuntu dapper universe multiverse
EOF
- }
- close FH;
- # Create dpkg status
- open(FH, $dir/var/lib/dpkg/status);
- close FH; #empty file
- # Create apt.conf
- $arch ||= `dpkg --print-architecture`;
- chomp $arch;
- open(FH, $dir/etc/apt/apt.conf);
- print FH EOF;
+}
+close FH;
+# Create dpkg status
+open(FH, '', $dir/var/lib/dpkg/status);
+close FH; #empty file
+# Create apt.conf
+$arch ||= `dpkg --print-architecture`;
+chomp $arch;
+open(FH, $dir/etc/apt/apt.conf);
+print FH EOF;
Apt {
Architecture $arch;
-}
+};
Dir $dir;
Dir::State::status $dir/var/lib/dpkg/status;
EOF
- close FH;
- print Now edit $dir/etc/apt/sources.list\n;
- print Then run chdist apt-get $dist update\n;
- print And enjoy.\n;
+close FH;
+print Now edit $dir/etc/apt/sources.list\n;
+print Then run chdist apt-get $dist update\n;
+print And enjoy.\n;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 1a541983310a581efabbcd0e34b38acde5c2fbfe
Author: James Vega james...@debian.org
Date: Wed Jul 27 22:01:25 2011 -0400
chdist: Perform filtering in chdist instead of through shell pipelines
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index cb9c27d..398fd8c 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -250,32 +250,52 @@ sub aptcmd
exec($cmd, @args);
}
-sub bin2src {
- my ($dist, $pkg) = @_;
- dist_check($dist);
- if (!$pkg) {
- die E: no package name provided. Exiting.\n;
- }
- my $args = aptopts($dist) . show $pkg;
- my $aptconfig = aptconfig($dist);
- my $source = `$aptconfig /usr/bin/apt-cache $args|grep '^Source:'`;
- exit($?) if($? != 0);
- $source =~ s/Source: (.*)/$1/;
- print $pkg if($source eq '');
- print $source if($source ne '');
+sub bin2src
+{
+my ($dist, $pkg) = @_;
+dist_check($dist);
+if (!defined($pkg)) {
+ fatal(No package name provided. Exiting.);
+}
+my @args = (aptopts($dist), 'show', $pkg);
+aptconfig($dist);
+my $src = $pkg;
+my $pid = open(CACHE, '-|', 'apt-cache', @args);
+if (!defined($pid)) {
+ fatal(Couldn't run apt-cache: $!);
+}
+if ($pid) {
+ while (CACHE) {
+ if (m/^Source: (.*)/) {
+ $src = $1;
+ last;
+ }
+ }
+ close CACHE || fatal(bad apt-cache $!: $?);
+ print $src\n;
+}
}
sub src2bin {
- my ($dist, $pkg) = @_;
- dist_check($dist);
- if (!$pkg) {
- die E: no package name provided. Exiting.\n;
- }
- my $args = aptopts($dist) . showsrc $pkg;
- my $bins = `/usr/bin/apt-cache $args|sed -n '/^Package: $pkg/{N;p}' | sed -n
's/^Binary: \\(.*\\)/\\1/p'`;
- exit($?) if ($? != 0);
- my @bins = split /, /, $bins;
- print join \n, @bins;
+my ($dist, $pkg) = @_;
+dist_check($dist);
+if (!defined($pkg)) {
+ fatal(no package name provided. Exiting.);
+}
+my @args = (aptopts($dist), 'showsrc', $pkg);
+my $pid = open(CACHE, '-|', 'apt-cache', @args);
+if (!defined($pid)) {
+ fatal(Couldn't run apt-cache: $!);
+}
+if ($pid) {
+ while (CACHE) {
+ if (m/^Binary: (.*)/) {
+ print join(\n, split(/, /, $1)) . \n;
+ last;
+ }
+ }
+ close CACHE || fatal(bad apt-cache $!: $?);
+}
}
sub dist_create
@@ -547,13 +567,18 @@ sub compare_src_bin {
}
}
-sub grep_file {
- my (@argv, $file) = @_;
- my $dist = shift @argv;
- dist_check($dist);
- my $f = glob($datadir . '/' . $dist . /var/lib/apt/lists/*_$file);
- # FIXME avoid shell invoc, potential quoting problems here
- system(cat $f | grep-dctrl @argv);
+sub grep_file(\@$)
+{
+my ($argv, $file) = @_;
+my $dist = shift @{$argv};
+dist_check($dist);
+my @f = glob($datadir . '/' . $dist . /var/lib/apt/lists/*_$file);
+if (@f) {
+ exec('grep-dctrl', @{$argv}, @f);
+}
+else {
+ fatal(Couldn't find a $file for $dist.);
+}
}
sub list {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 664359dc060e3200fcc6ae7057fd2d50d44cd59b
Author: James Vega james...@debian.org
Date: Wed Jul 27 22:39:33 2011 -0400
chdist: Use newest binary version, when multiple exist, for
compare-src-bin-*.
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index da4a08e..6b7b1f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,11 @@ devscripts (2.11.1) UNRELEASED; urgency=low
at the end of the source files. (Closes: #625620)
* debuild: Call dpkg-source --before-build/--after-build when emulating
dpkg-buildpackage. (Closes: #628481)
- * chdist: Create /etc/apt/apt.conf.d and /etc/apt/preferences.d in the
-chdist directory structure. (Closes: #528274, LP: #566682)
+ * chdist:
++ Create /etc/apt/apt.conf.d and /etc/apt/preferences.d in the chdist
+ directory structure. (Closes: #528274, LP: #566682)
++ When multiple binary versions exist, use newest version for
+ compare-src-bin-*.
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 398fd8c..33a4591 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -469,102 +469,97 @@ sub dist_compare(\@;$;$) {
sub compare_src_bin {
- my ($dist, $do_compare) = @_;
+my ($dist, $do_compare) = @_;
- $do_compare = 0 if $do_compare eq 'false';
-
- dist_check($dist);
-
-
- # Get all packages
- my %packages;
- my @parse_types = ('Sources', 'Packages');
- my @comp_types = ('Sources_Bin', 'Packages');
+dist_check($dist);
- foreach my $type (@parse_types) {
- my $files = get_distfiles($dist, $type);
- my @files = @$files;
- foreach my $file ( @files ) {
- my $parsed_file = parseFile($file);
- foreach my $package ( keys(%{$parsed_file}) ) {
-if ( $packages{$dist}{$package} ) {
- warn W: Package $package is already listed for $dist. Not
overriding.\n;
-} else {
- $packages{$type}{$package} = $parsed_file-{$package};
-}
- }
- }
- }
+# Get all packages
+my %packages;
+my @parse_types = ('Sources', 'Packages');
+my @comp_types = ('Sources_Bin', 'Packages');
+
+foreach my $type (@parse_types) {
+ my $files = get_distfiles($dist, $type);
+ my @files = @$files;
+ foreach my $file ( @files ) {
+ my $parsed_file = parseFile($file);
+ foreach my $package ( keys(%{$parsed_file}) ) {
+ if ( $packages{$dist}{$package} ) {
+ warn W: Package $package is already listed for $dist. Not
overriding.\n;
+ } else {
+ $packages{$type}{$package} = $parsed_file-{$package};
+ }
+ }
+ }
+}
- # Build 'Sources_Bin' hash
- foreach my $package ( keys( %{$packages{Sources}} ) ) {
- my $package_h = \%{$packages{Sources}{$package}};
- if ( $package_h-{'Binary'} ) {
- my @binaries = split(, , $package_h-{'Binary'});
- my $version = $package_h-{'Version'};
- foreach my $binary (@binaries) {
-if ( $packages{Sources_Bin}{$binary} ) {
- # TODO: replace if new version is newer (use dpkg
--compare-version?)
- warn There is already a version for binary $binary. Not
replacing.\n;
-} else {
- $packages{Sources_Bin}{$binary}{Version} = $version;
-}
- }
- } else {
- warn Source $package has no binaries!\n;
- }
- }
+# Build 'Sources_Bin' hash
+foreach my $package ( keys( %{$packages{Sources}} ) ) {
+ my $package_h = \%{$packages{Sources}{$package}};
+ if ( $package_h-{'Binary'} ) {
+ my @binaries = split(, , $package_h-{'Binary'});
+ my $version = $package_h-{'Version'};
+ foreach my $binary (@binaries) {
+ if (defined $packages{Sources_Bin}{$binary}) {
+ my $alt_ver = $packages{Sources_Bin}{$binary}{Version};
+ # Skip this entry if it's an older version than we already
+ # have
+ if (version_compare($version, $alt_ver) 0) {
+ next;
+ }
+ }
+ $packages{Sources_Bin}{$binary}{Version} = $version;
+ }
+ } else {
+ warn Source $package has no binaries!\n;
+ }
+}
- # Get entire list of packages
- my @all_packages = uniq sort ( map { keys(%{$packages{$_}}) } @comp_types );
+# Get entire list of packages
+my @all_packages = uniq sort ( map { keys(%{$packages{$_}}) } @comp_types
);
- foreach my $package (@all_packages) {
- my $line = $package ;
- my $status = ;
- my $details;
+foreach my $package (@all_packages) {
+ my $line = $package
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit ec8e670e7582c65e4a64c5e3ae4ae08f60da8d31
Author: James Vega james...@debian.org
Date: Wed Jul 27 22:43:40 2011 -0400
chdist: Fix the prototype for dist_compare
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 33a4591..7974aa8 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -384,15 +384,11 @@ sub get_distfiles {
}
-sub dist_compare(\@;$;$) {
+sub dist_compare(\@$$) {
# Takes a list of dists, a type of comparison and a do_compare flag
my ($dists, $do_compare, $type) = @_;
- # Type is 'Sources' by default
- $type ||= 'Sources';
type_check($type);
- $do_compare = 0 if $do_compare eq 'false';
-
# Get the list of dists from the referrence
my @dists = @$dists;
map { dist_check($_) } @dists;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit 31fa951d5949ff70fc0d27a8cf6d6fa5e627e147
Author: James Vega james...@debian.org
Date: Wed Jul 27 22:46:26 2011 -0400
chdist: Consistently use fatal() instead of die.
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 7974aa8..562d8be 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -168,7 +168,7 @@ GetOptions(
);
# Fix-up relative paths
-$datadir = cwd() . /$datadir unless $datadir =~ m!^/!;
+$datadir = cwd() . /$datadir if $datadir !~ m!^/!;
$datadir = abs_path($datadir);
if ($help) {
@@ -193,27 +193,28 @@ sub fatal
}
sub uniq (@) {
- my %hash;
- map { $hash{$_}++ == 0 ? $_ : () } @_;
+my %hash;
+map { $hash{$_}++ == 0 ? $_ : () } @_;
}
sub dist_check {
- # Check that dist exists in $datadir
- my ($dist) = @_;
- if ($dist) {
- my $dir = $datadir . '/' . $dist;
- return 0 if (-d $dir);
- die E: Could not find $dist in $datadir. Run `$0 create $dist` first.
Exiting.\n;
- } else {
- die E: No dist provided. Exiting. \n;
- }
+# Check that dist exists in $datadir
+my ($dist) = @_;
+if ($dist) {
+ my $dir = $datadir/$dist;
+ return 0 if (-d $dir);
+ fatal(Could not find $dist in $datadir. Run `$progname create $dist`
first.);
+}
+else {
+ fatal('No dist provided.');
+}
}
sub type_check {
- my ($type) = @_;
- if ( ($type ne 'Sources') ($type ne 'Packages') ) {
- die E: Unknown type $type. Exiting.\n;
- }
+my ($type) = @_;
+if (($type ne 'Sources') ($type ne 'Packages')) {
+ fatal(Unknown type $type.);
+}
}
sub aptopts
@@ -369,9 +370,6 @@ sub get_distfiles {
# Takes a dist and a type
my ($dist, $type) = @_;
- # Let the above function check the type
- #type_check($type);
-
my @files;
foreach my $file ( glob($datadir . '/' . $dist .
/var/lib/apt/lists/*_$type) ) {
@@ -437,8 +435,8 @@ sub dist_compare(\@$$) {
# Do compare
if ($do_compare) {
-if ($#dists != 1) {
- die E: Can only compare versions if there are two distros.\n;
+if (!@dists) {
+ fatal('Can only compare versions if there are two distros.');
}
if (!$status) {
my $cmp = version_compare($versions[0], $versions[1]);
@@ -573,7 +571,7 @@ sub grep_file(\@$)
}
sub list {
- opendir(DIR, $datadir) or die can't open dir $datadir: $!;
+ opendir(DIR, $datadir) or fatal(can't open dir $datadir: $!);
while (my $file = readdir(DIR)) {
if ( (-d $datadir/$file) ($file =~ m|^\w+|) ) {
print $file\n;
@@ -589,7 +587,7 @@ sub parseFile {
# Parse a source file and returns results as a hash
- open(FILE, $file) || die(Could not open $file : $!\n);
+ open(FILE, '', $file) || fatal(Could not open $file : $!);
# Use %tmp hash to store tmp data
my %tmp;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch:
commit b6f741f4a0334d8bcc6ab3ee477786f04ad0c4f5
Author: James Vega james...@debian.org
Date: Wed Jul 27 23:05:32 2011 -0400
chdist: Copy archive keyrings to etc/apt/trusted.gpg.d
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 6b7b1f4..c7b57a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low
directory structure. (Closes: #528274, LP: #566682)
+ When multiple binary versions exist, use newest version for
compare-src-bin-*.
++ Copy archive keyrings to etc/apt/trusted.gpg.d.
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index 562d8be..300ad73 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -129,6 +129,7 @@ License, or (at your option) any later version.
use strict;
use warnings;
use feature 'switch';
+use File::Copy qw(cp);
use File::Path qw(make_path);
use File::Basename;
use Getopt::Long qw(:config require_order);
@@ -311,8 +312,8 @@ sub dist_create
}
make_path($datadir);
foreach my $d (('/etc/apt', '/etc/apt/apt.conf.d',
'/etc/apt/preferences.d',
- '/var/lib/apt/lists/partial',
'/var/cache/apt/archives/partial',
- '/var/lib/dpkg')) {
+ '/etc/apt/trusted.gpg.d', '/var/lib/apt/lists/partial',
+ '/var/cache/apt/archives/partial', '/var/lib/dpkg')) {
make_path($dir/$d);
}
@@ -358,8 +359,14 @@ Dir $dir;
Dir::State::status $dir/var/lib/dpkg/status;
EOF
close FH;
-print Now edit $dir/etc/apt/sources.list\n;
-print Then run chdist apt-get $dist update\n;
+foreach my $keyring (qw(debian-archive-keyring.gpg
+ debian-archive-removed-keys.gpg
+ ubuntu-archive-keyring.gpg
+ ubuntu-archive-removed-keys.gpg)) {
+ cp(/usr/share/keyrings/$keyring, $dir/etc/apt/trusted.gpg.d/);
+}
+print Now edit $dir/etc/apt/sources.list\n unless $version;
+print Run chdist apt-get $dist update\n;
print And enjoy.\n;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-37-gabb73eb
The following commit has been merged in the master branch: commit abb73eb22a365b0eafa35b40e0060919f01a50ba Merge: b6f741f4a0334d8bcc6ab3ee477786f04ad0c4f5 92078880086a8f848d032659d6c9619cb98a857f Author: James Vega james...@debian.org Date: Wed Jul 27 23:07:00 2011 -0400 Merge remote-tracking branch 'origin/master' diff --combined debian/changelog index c7b57a0,7914a17..96f4a2c --- a/debian/changelog +++ b/debian/changelog @@@ -21,16 -21,12 +21,18 @@@ devscripts (2.11.1) UNRELEASED; urgency at the end of the source files. (Closes: #625620) * debuild: Call dpkg-source --before-build/--after-build when emulating dpkg-buildpackage. (Closes: #628481) + * chdist: ++ Create /etc/apt/apt.conf.d and /etc/apt/preferences.d in the chdist + directory structure. (Closes: #528274, LP: #566682) ++ When multiple binary versions exist, use newest version for + compare-src-bin-*. ++ Copy archive keyrings to etc/apt/trusted.gpg.d. [ Christoph Berg ] * dscextract: new script, extracts a single file from a Debian source package. + * debcheckout: When retrieving the source for debian/-only repositories, + move all .dsc components to the current directory, not just .orig.tar.gz. -- David Prévot taf...@debian.org Wed, 08 Jun 2011 12:16:32 -0400 -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#628481: debclean: please respect the option 'unapply-patches' in debian/source/local-options
clone 628481 -1 retitle -1 debuild: respect the option 'unapply-patches' in debian/source/local-options user devscri...@packages.debian.org usertag -1 debuild retitle 628481 debuild: Add an option to unapply patches for debuild clean notfound 628481 2.10.69ubuntu2 thanks On Sun, Jul 10, 2011 at 11:22:17AM -0400, James Vega wrote: On Sun, May 29, 2011 at 02:15:08PM +0200, Reinhard Tartler wrote: In source format 3.0, the option 'unapply-patches' (usually set in debian/source/local-options) is used to indicate that patches are to be unapplied after building the package. This is commongly used when the package itself is maintained in a VCS that contains unpatched upstream source and where you want to keep the tree unpatched even after a package build. Having 'debuild clean' and 'debclean' respecting this setting would streamline the workflow with source format 1.0, where a 'debclean' restores the source tree to a state that allows further VCS operations such as investigating and committing changes easily. Adding 'dpkg-source --after-build'/'dpkg-source --before-build' calls to the dpkg-buildpackage emulation of debuild does make sense and I'll add that. Honoring unapply-patches from 'debuild clean' doesn't correspond to how debuild is intended to work when the standard targets are given. In that case, it's just a thin wrapper around 'debian/rules target'. This is also how 'dpkg-buildpackage --target target' works. I'm also hesitant to add this behavior to debclean by default. Adding an option to call 'dpkg-source --after-build' is a possibility, but doing it by default so that there's parity with 1.0 source packages isn't a good enough argument. 1.0 source package and 3.0 source packages are handled differently by dpkg's tools and the devscripts tools should follow their lead in that regard. As per the above reasons, I'm separating out the request into one for honoring the options in debuild's dpkg-buildpackage emulation (which will be committed shortly) and one for adding an option to force patches to be unapplied when debuild is acting as a thin wrapper around debian/rules (which will automatically make debclean work). -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-26-g97840d4
The following commit has been merged in the master branch:
commit cfb793a29575db619dc86ad6286ddffd190982d5
Author: James Vega james...@debian.org
Date: Mon Jul 11 22:23:27 2011 -0400
debuild: Call dpkg-source --before-build/--after-build
Newer source formats can perform actions (such as (un)applying a series of
quilt
patches) before/after the build takes place. Calling dpkg-source ensures
this
behavior is maintained when we're emulating dpkg-buildpackage.
Closes: #628481
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index b98af6f..5e31fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
Christian Kastner for the patch. (Closes: #628076)
* mergechanges: Do not drop fields when the Files/Checksums-* fields are not
at the end of the source files. (Closes: #625620)
+ * debuild: Call dpkg-source --before-build/--after-build when emulating
+dpkg-buildpackage. (Closes: #628481)
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index 2ec7355..ac149a1 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -787,6 +787,8 @@ if ($command_version eq 'dpkg') {
my $compression='';
my $comp_level='';
+my $dirn = basename(cwd());
+
# and one for us
my @debsign_opts = ();
# and one for dpkg-cross if needed
@@ -1075,6 +1077,10 @@ if ($command_version eq 'dpkg') {
}
}
+ chdir '..' or fatal can't chdir ..: $!;
+ system_withecho('dpkg-source', '--before-build', $dirn);
+ chdir $dirn or fatal can't chdir $dirn: $!;
+
# First dpkg-buildpackage action: run dpkg-checkbuilddeps
if ($checkbuilddep) {
if ($binarytarget eq 'binary-arch') {
@@ -1108,7 +1114,6 @@ EOT
# Next dpkg-buildpackage action: dpkg-source
if (! $binaryonly) {
- my $dirn = basename(cwd());
my @cmd = (qw(dpkg-source));
push @cmd, @passopts;
push @cmd, $diffignore if $diffignore;
@@ -1188,6 +1193,9 @@ EOT
}
}
+ chdir '..' or fatal can't chdir ..: $!;
+ system_withecho('dpkg-source', '--after-build', $dirn);
+ chdir $dirn or fatal can't chdir $dirn: $!;
# identify the files listed in $changes; this will be used for the
# emulation of the dpkg-buildpackage fileomitted() function
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#628481: debclean: please respect the option 'unapply-patches' in debian/source/local-options
On Sun, May 29, 2011 at 02:15:08PM +0200, Reinhard Tartler wrote: In source format 3.0, the option 'unapply-patches' (usually set in debian/source/local-options) is used to indicate that patches are to be unapplied after building the package. This is commongly used when the package itself is maintained in a VCS that contains unpatched upstream source and where you want to keep the tree unpatched even after a package build. Having 'debuild clean' and 'debclean' respecting this setting would streamline the workflow with source format 1.0, where a 'debclean' restores the source tree to a state that allows further VCS operations such as investigating and committing changes easily. Adding 'dpkg-source --after-build'/'dpkg-source --before-build' calls to the dpkg-buildpackage emulation of debuild does make sense and I'll add that. Honoring unapply-patches from 'debuild clean' doesn't correspond to how debuild is intended to work when the standard targets are given. In that case, it's just a thin wrapper around 'debian/rules target'. This is also how 'dpkg-buildpackage --target target' works. I'm also hesitant to add this behavior to debclean by default. Adding an option to call 'dpkg-source --after-build' is a possibility, but doing it by default so that there's parity with 1.0 source packages isn't a good enough argument. 1.0 source package and 3.0 source packages are handled differently by dpkg's tools and the devscripts tools should follow their lead in that regard. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-21-gf61004e
The following commit has been merged in the master branch: commit f61004e8e68b0e7b44fdea3d6f90b090021e3233 Author: Timo Juhani Lindfors timo.lindf...@iki.fi Date: Fri Jun 3 13:22:01 2011 +0300 debsnap: add EXAMPLES section to man page. Signed-off-by: James Vega james...@debian.org diff --git a/scripts/debsnap.1 b/scripts/debsnap.1 index 336003e..22f632e 100644 --- a/scripts/debsnap.1 +++ b/scripts/debsnap.1 @@ -90,6 +90,23 @@ but operations otherwise succeeded as expected. In some cases packages may fail to be downloaded because they are no longer available on the snapshot mirror, so any caller should expect this may occur in normal use. +.SH EXAMPLES +.TP +.BR debsnap -a amd64 xterm 256-1 +Download the binary package of specific a xterm version for amd64 architecture. +.TP +.BR debsnap -a armel xterm +Download binary packages for all versions of xterm for armel architecture. +.TP +.BR debsnap --binary xterm 256-1 +Download binary packages for a specific a xterm version but for all architectures. +.TP +.BR debsnap --binary xterm +Download binary packages for all version of xterm version for all architectures. +.TP +.BR aptitude search '~i' -F '%p %V' | while read pkg ver; do debsnap -a $(dpkg-architecture -qDEB_HOST_ARCH) -a all $pkg $ver; done +Download binary packages of all packages that are installed on the system. + .SH FILES .TP .I /etc/devscripts.conf -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Re: should debsnap -aamd64 also download architecture independent packages?
On Tue, Jul 05, 2011 at 12:30:55AM +0300, Timo Juhani Lindfors wrote: Hi, James Vega james...@debian.org writes: Ok. I noticed you updated the man page. Since debsnap can now support so many different options I converted the examples that were mentioned in bug #587523 to a proper EXAMPLES section. Can you check the attached patch? Looks good. Thanks. Sorry to bother you again but was this patch included to some version control already? I don't see it in at least It has been now. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-22-g23a5c42
The following commit has been merged in the master branch:
commit 23a5c42b2eb1bf9f5a40c57f7921cd0f2d78d1fd
Author: James Vega james...@debian.org
Date: Fri Jul 8 17:52:48 2011 -0400
mergechanges: Do not drop fields in merged file.
We were calling sed such that all lines from the Files/Checksums-* fields to
the end of the input file were deleted. Since the ordering of the fields is
not relevant, sed expressions needed to be adjusted to only delete the
specific field.
Closes: #625620
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 2f2f987..b98af6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
Lindfors for the suggestion.
* uscan: Fix --destdir regression when repacking zip archives. Thanks to
Christian Kastner for the patch. (Closes: #628076)
+ * mergechanges: Do not drop fields when the Files/Checksums-* fields are not
+at the end of the source files. (Closes: #625620)
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh
index 8c25945..bb8fceb 100755
--- a/scripts/mergechanges.sh
+++ b/scripts/mergechanges.sh
@@ -191,8 +191,9 @@ fi
# Replace the Architecture: field, nuke the value of Files:, and insert
# the Description: field before the Changes: field
eval sed -e 's,^Architecture: .*,Architecture: ${ARCHS},' \
--e '/^Files: /,$ d; /^Checksums-.*: /,$ d' \
--e '/^Description:/,/^[^ ]/{/^Description:/d;/^[ ]/d}' \
+-e '/^Checksums-.*:/,/^[^ ]/{/^Checksums-.*:/d;/^ /d}' \
+-e '/^Files:/,/^[^ ]/{/^Files:/d;/^ /d}' \
+-e '/^Description:/,/^[^ ]/{/^Description:/d;/^ /d}' \
-e '/^Changes:/{r '${DESCFILE} -e ';aChanges: ' -e ';d}' \
-e 's,^Format: .*,Format: ${FORMATS},' \
${OUTPUT} ${REDIR1}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#631477: [debcommit] Be smart as to how to tag a repository
On Fri, Jun 24, 2011 at 10:54:43AM +0200, Joachim Breitner wrote: debcommit -r is great as it integrates well into other uses of debcommit. But when the source is maintained using a VCS helper such as git-buildpackage or git-dpm, it is unfortunate that it creates different tags than these. Also, those may add more tags, e.g. for the corresponding patched state. Hence, if debcommit could find out whether the source is managed by git-buildpackage (e.g. if debian/.gbp.conf is present) or by git-dpm (in which case debian/.git-dpm will be present) and then use the appropriate tool to tag the release, that would be very nice. I don't use either of those tools. What would be the appropriate way to tag when those tools are in use? -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#628477: [build-rdepends] fails when deb-src lines point to different host from deb lines
On Sun, May 29, 2011 at 01:32:39PM +0200, Christoph Egger wrote: running build-rdepends yields Warning: Ignoring missing sources file sol.asgard_mirrors_debian_dists_unstable_contrib_source_Sources. (Missing component in sources.list?) Warning: Ignoring missing sources file sol.asgard_mirrors_debian_dists_unstable_main_source_Sources. (Missing component in sources.list?) Warning: Ignoring missing sources file sol.asgard_mirrors_debian_dists_unstable_non-free_source_Sources. (Missing component in sources.list?) I am using a local mirror for binary packages that does not have source packages around. My sources list looks like that: It should still work since your other sources have a deb-src entry. It's just warning since the one mirror doesn't have a matching deb-src entry and therefore a Sources file under /var/lib/apt/lists. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-20-g78ec913
The following commit has been merged in the master branch: commit 78ec91371d4437e4292639b6c6cdbbe9c6960789 Author: James Vega james...@debian.org Date: Wed Jun 22 08:57:29 2011 -0400 Add changelog entry for uscan --destdir fix. Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 7bea0bd..2f2f987 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low authenticated URLs. (Closes: #628674) * debsnap: Allow -a to be specified multiple times. Thanks to Timo Juhani Lindfors for the suggestion. + * uscan: Fix --destdir regression when repacking zip archives. Thanks to +Christian Kastner for the patch. (Closes: #628076) [ Christoph Berg ] * dscextract: new script, extracts a single file from a Debian source -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-20-g78ec913
The following commit has been merged in the master branch:
commit f2e3cf6c07fda1da156374fcb7897cc93a096e34
Author: Christian Kastner deb...@kvr.at
Date: Fri May 27 00:21:18 2011 +0200
Fix --destdir regression when repacking ZIP files
The --destdir option no longer worked with relative paths because we cd
before
archiving. This patch uses an absolute path when creating the archive.
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index d760281..c1599d3 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -24,6 +24,7 @@
use 5.008; # uses 'our' variables and filetest
use strict;
use Cwd;
+use Cwd 'abs_path';
use File::Basename;
use File::Copy;
use File::Temp qw/tempdir/;
@@ -1374,12 +1375,13 @@ EOF
my $tempdir = tempdir ( uscan, TMPDIR = 1, CLEANUP = 1 );
my $globpattern = *;
my $hidden = .[!.]*;
+ my $absdestdir = abs_path($destdir);
system(unzip -q -a -d $tempdir $destdir/$newfile_base) == 0
or die(Repacking from zip to tar.gz failed (could not unzip)\n);
if (defined glob($tempdir/$hidden)) {
$globpattern .= $hidden;
}
- system(cd $tempdir; GZIP=-9 tar --owner=root --group=root --mode=a+rX
-czf $destdir/$newfile_base_gz $globpattern) == 0
+ system(cd $tempdir; GZIP=-9 tar --owner=root --group=root --mode=a+rX
-czf $absdestdir/$newfile_base_gz $globpattern) == 0
or die(Repacking from zip to tar.gz failed (could not create
tarball)\n);
unlink $destdir/$newfile_base;
$newfile_base = $newfile_base_gz;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#628192: [uscan] fails to repack .zip file, tries to access a .tar.gz instead of a .zip
forcemerge 628076 628192 thanks On Sat, May 28, 2011 at 08:55:53AM +0200, Andreas Beckmann wrote: the command uscan --verbose --repack fails with the following messages. Just downloading the zip file forks fine. devscripts 2.10.73 has the same buggy behavior. $ uscan --verbose --repack -- Scanning for watchfiles in . -- Found watchfile in ./debian -- In debian/watch, processing watchfile line: http://googlecode.debian.net/p/thrust/thrust-(\d+.*).zip -- Found the following matching hrefs: /p/thrust/thrust-1.4.0.zip Newest version on remote site is 1.4.0, local version is 0.1 = Newer version available from http://googlecode.debian.net/p/thrust/thrust-1.4.0.zip -- Downloading updated package thrust-1.4.0.zip -- Repacking from zip to .tar.gz uscan warning: ../thrust-1.4.0.tar.gz does not appear to be a compressed file; the file command says: ERROR: cannot open `../thrust-1.4.0.tar.gz' (No such file or directory) This looks like you've used --destdir, which isn't handled properly when repacking zip files. I'm merging with #628076 which has a patch to fix that behavior. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Re: Some Makefile simplification
On Wed, Jun 08, 2011 at 12:45:00PM -0400, David Prévot wrote: Le 06/06/2011 19:26, Benjamin Drung a écrit : * Should we get rid of d/install, d/links, and d/manpages and make the Makefile more powerful (= revert those two commits posted above)? I don't understand the need (or definition) of a « powerful » Makefile in a native Debian package. I think that using a Makefile to handle installation that could be directly handled by debhelper makes the build system harder to understand and error prone, and am not sure that going back to a complicated Makefile as it was five years ago is an improvement. I think having a clear line between building and installing and creating a package is a worthwhile goal. There's no reason we should require someone build a .deb just to have a properly installed devscripts. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Re: should debsnap -aamd64 also download architecture independent packages?
On Fri, Jun 03, 2011 at 01:26:44PM +0300, Timo Juhani Lindfors wrote: Hi, James Vega james...@debian.org writes: That sounds like a good idea. Just committed the implementation. aha, great! You seemed to also remove -w from perl, was that a mistake? At least I don't get any warnings if I put it back. I removed it because there's already a use warnings;, which always works. The -w would be overridden if the script was run via perl debsnap ... instead of debsnap Or should -aall always be implicit? I'd prefer being explicit. Ok. I noticed you updated the man page. Since debsnap can now support so many different options I converted the examples that were mentioned in bug #587523 to a proper EXAMPLES section. Can you check the attached patch? Looks good. Thanks. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#487185: [devscripts] The same problem when not using local MTA
On Thu, Jun 02, 2011 at 11:53:52AM +0200, Mònica Ramírez Arceda wrote: I have the same problem when I don't use a local MTA. Actually, you don't. $ cat .devscripts ... BTS_SMTP_HOST=ssmtp://myhost.net BTS_SMTP_AUTH_USERNAME=myu...@myhost.net $ cat .bashrc ... export DEBEMAIL=myu...@myhost.net $ bts found 358716 1.3.6-1 '# re-add version information lost in reassign' bts: failed to open SMTPS connection to ssmtp://myhost.net (Net::SMTP::SSL: connect: Connection refused) Your error is about not being able to connect to the server. This is completely different from having the email itself bounced due to an unrecognized STMP envelope. Also, Net::SMTP does set an SMTP envelope. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Re: should debsnap -aamd64 also download architecture independent packages?
On Thu, Jun 02, 2011 at 06:39:36PM +0300, Timo Juhani Lindfors wrote: today I tried to download all packages that are installed in the system. I generated commands like debsnap -aamd64 ca-certificates 20080809 [snip] but then realized that this only works for architecture specific packages. For example debsnap -aamd64 libdb4.3-ruby1.8 0.6.5-2 does nothing. Right, since the architecture for that package is all. Should I change debsnap to allow multiple architectures so that one could say debsnap -aamd64 -aall libdb4.3-ruby1.8 0.6.5-2 to download either version? That sounds like a good idea. Just committed the implementation. Or should -aall always be implicit? I'd prefer being explicit. This did make me think of another idea, though. There's currently no easy way to say “download all binary packages for this source package”. It seems that would be a useful bit to add. I think modeling it after the BTS might make sense: debsnap -b src:libdb-ruby Although, it could be confusing if src: only changes behavior when -b is used. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-8-g9eea323
The following commit has been merged in the master branch: commit 9eea323f3126d9d8f7a4fe508026b1e3314d76d6 Author: James Vega james...@debian.org Date: Thu Jun 2 21:07:07 2011 -0400 Changelog entry for genmanpage fix Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 908735a..a614dc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ devscripts (2.11.1) UNRELEASED; urgency=low [ David Prévot ] * Stylish manual pages convention review. (Closes: #628447) + * Handle the last description in devscripts(1) (Closes: #628086) [ Adam D. Barratt ] * debian/copyright: Update repository information somewhat belatedly -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-8-g9eea323
The following commit has been merged in the master branch:
commit c8c488b08baaef410e7fd4ec5c3e3aa3a64599d7
Author: David Prévot taf...@debian.org
Date: Thu May 26 22:46:51 2011 -0400
Handle the last description in devscripts(1)
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/genmanpage.pl b/debian/genmanpage.pl
index 806b77b..f4b2a55 100644
--- a/debian/genmanpage.pl
+++ b/debian/genmanpage.pl
@@ -26,6 +26,11 @@ while(CONTROL) {
$package = $1;
$description = $2
}
+# Handle the last description
+elsif (/^ \./ and $package and $description) {
+print $ITEM_LEADIN . $package . $ITEM_LEADOUT . \n;
+print $description . \n;
+}
else {
s/^.{3}//;
$description .= $_;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-4-g2606dc5
The following commit has been merged in the master branch:
commit 2606dc58339dcdc185254831f4a41d42abe6f127
Author: James Vega james...@debian.org
Date: Wed Jun 1 20:32:16 2011 -0400
debchange: Remove dapper from the list of recognized distributions.
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index a010c16..0c38101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ devscripts (2.11.1) UNRELEASED; urgency=low
* debian/copyright: Update repository information somewhat belatedly
for the move to git.
+ [ James Vega ]
+ * debchange: Remove dapper from the list of recognized distributions.
+
-- Benjamin Drung bdr...@debian.org Sun, 29 May 2011 18:41:13 +0200
devscripts (2.11.0) unstable; urgency=low
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index e190b6b..306445c 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -412,8 +412,8 @@ if (defined $opt_D) {
$warnings++ if not $opt_force_dist;
}
} elsif ($distributor eq 'Ubuntu') {
- unless ($opt_D =~
/^((dapper|hardy|lucid|maverick|natty|oneiric)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
- warn $progname warning: Recognised distributions
are:\n{dapper,hardy,jaunty,karmic,lucid,maverick,natty}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n;
+ unless ($opt_D =~
/^((hardy|lucid|maverick|natty|oneiric)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
+ warn $progname warning: Recognised distributions
are:\n{hardy,jaunty,karmic,lucid,maverick,natty}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n;
$warnings++ if not $opt_force_dist;
}
} else {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-5-g4c1665d
The following commit has been merged in the master branch:
commit 4c1665d98a3b5c50efd8da2b445ab40c93041e11
Author: James Vega james...@debian.org
Date: Wed Jun 1 22:44:32 2011 -0400
debcheckout: Handle Alioth's new anonymous access URLs
Closes: #628674
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 0c38101..c3749dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
[ James Vega ]
* debchange: Remove dapper from the list of recognized distributions.
+ * debcheckout: Handle Alioth's new anonymous access URLs when converting to
+authenticated URLs. (Closes: #628674)
-- Benjamin Drung bdr...@debian.org Sun, 29 May 2011 18:41:13 +0200
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 38a9023..99e8646 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -425,6 +425,14 @@ sub set_auth() {
$user_local =~ s|(.*)(@)|$1|;
my $user_url = $url;
+# Adjust urls from new-style anonymous access to old-style and then deal
+# with adjusting for authentication
+$url =~ s@anonscm\.debian\.org/b...@bzr.debian.org@;
+$url =~ s@anonscm\.debian\.org/da...@darcs.debian.org/darcs@;
+$url =~ s@git://anonscm\.debian\.org@git://git.debian.org@;
+$url =~ s@anonscm\.debian\.org/g...@git.debian.org/git@;
+$url =~ s@anonscm\.debian\.org/h...@hg.debian.org/hg@;
+$url =~ s@svn://anonscm\.debian\.org@svn://svn.debian.org@;
given ($repo_type) {
when (bzr) {
$url =~
s|^[\w+]+://(bzr\.debian\.org)/(.*)|bzr+ssh://$user$1/bzr/$2|;
@@ -921,6 +929,8 @@ sub guess_repo_type($$) {
$repo_type = $1;
} elsif ($repo_url =~ /^https?:\/\/(svn|git|hg|bzr|darcs)\.debian\.org/) {
$repo_type = $1;
+} elsif ($repo_url =~
m@^https?://anonscm.debian.org/(svn|git|hg|bzr|darcs)/@) {
+ $repo_type = $1;
}
return $repo_type;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#628066: /usr/bin/uscan: uscan suddenly giving error 404 for SF redirector
reassign 628066 qa.debian.org retitle 628066 SF.net redirector returning 404 for all projects thanks On Fri, May 27, 2011 at 02:26:31AM +0530, Onkar Shinde wrote: Uscan has suddenly started failing for me since today for watch files that use SF redirector. It was working till yesterday. Following is the error seen for 'uscan --verbose --report' in cdk source package. onkar@iBook:~/programs/cdk-1.2.8$ uscan --verbose --report -- Scanning for watchfiles in . -- Found watchfile in ./debian -- In debian/watch, processing watchfile line: http://sf.net/cdk/ cdk-(1\.[2468]\.[\d\.]+)\.tar\.gz debian uupdate uscan warning: In watchfile debian/watch, reading webpage http://qa.debian.org/watch/sf.php/cdk/ failed: 404 File Not Found -- Scan finished $ curl -I http://qa.debian.org/watch/sf.php/cdk/ HTTP/1.1 404 File Not Found Date: Thu, 26 May 2011 23:31:56 GMT Server: Apache X-Powered-By: PHP/5.3.3-7+squeeze1 Vary: Accept-Encoding Content-Type: text/html This is happening for every project I tried. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.73-22-g1dddb01
The following commit has been merged in the master branch: commit 1dddb01a4026135b53c324f7c141c5d7c6e37d35 Author: James Vega james...@debian.org Date: Tue May 24 22:58:10 2011 -0400 namecheck: Update Alioth's unknown project pattern. Closes: #627824 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 633d2b2..9a50ba1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ devscripts (2.11.0) UNRELEASED; urgency=low * Merge from Ubuntu: + dscverify: Use Ubuntu keyrings if on an Ubuntu-based system. + rmadison: Use Ubuntu's rmadison instance on Ubuntu. + * namecheck: Update Alioth's unknown project pattern. Thanks to Nelson A. +de Oliveira for the patch. (Closes: #627824) [ Benjamin Drung ] * Move add-patch, edit-patch, suspicious-source, what-patch, and wrap-and-sort diff --git a/scripts/namecheck.pl b/scripts/namecheck.pl index e9c36e0..3c109ef 100644 --- a/scripts/namecheck.pl +++ b/scripts/namecheck.pl @@ -256,7 +256,7 @@ __DATA__ # file ~/.namecheckrc with your own contents in the same format. # http://%s.tuxfamily.org/ | Not Found -http://alioth.debian.org/projects/%s | Invalid Project +http://alioth.debian.org/projects/%s | project does not exist http://developer.berlios.de/projects/%s | Invalid Project http://freshmeat.net/projects/%s | We encounted an error http://launchpad.net/%s | no page with this address -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.11.0, created. v2.11.0
The annotated tag, v2.11.0 has been created
at 973a4244a6ac724c37b1f582261facf1ca479a73 (tag)
tagging 3a3df19a81314ba27a8a5aae13ddea93d48ffef3 (commit)
replaces v2.10.73
tagged by James Vega
on Tue May 24 23:55:51 2011 -0400
- Shortlog
Version 2.11.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk3cfccACgkQDb3UpmEybUCi3QCglLx9nLaJqHbfX57X7twophPf
xGUAnA2vz2Q4ox4iJfctDmHfKzTRy0tX
=YwAA
-END PGP SIGNATURE-
Benjamin Drung (14):
Create directories in Makefile instead of using debian/dirs.
Move add-patch, edit-patch, and what-patch from ubuntu-dev-tools into
devscripts (Closes: #568481).
Move suspicious-source and wrap-and-sort from ubuntu-dev-tools into
devscripts.
Update debian/changelog.
Remove EOL whitespaces.
dget.1: Mention `debcheckout` under `SEE ALSO`.
debchange, uupdate: Use dpkg-vendor instead of lsb_release.
Merge branch 'python-scripts'
Merge from Ubuntu: debuild: Enforce Ubuntu merge policy.
debsign: Implement DEBSIGN_ALWAYS_RESIGN variable to skip the Would you
like to use the current signature? question.
Add test infrastructure.
Add DEBSIGN_ALWAYS_RESIGN to devscripts.conf.
po4a update
Bump version to 2.11.0
David Prévot (1):
Partial manual pages convention review
James Vega (10):
getbuildlog: Download from the new buildd pages.
getbuildlog: Use the updated build status pages to download raw logs.
debcheckout: Add $destdir as an argument to unpack_source
dscverify: Use Ubuntu keyrings if on an Ubuntu-based system.
rmadison: Use Ubuntu's rmadison instance on Ubuntu.
po4a update
namecheck: Update Alioth's unknown project pattern.
Add descriptions of new utilities
Add lintian overrides for the ldconfig calls dh adds to post{inst,rm}.
releasing version 2.11.0
---
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.73-3-g0396824
The following commit has been merged in the master branch:
commit 0396824c22e2c9c6fc7eb2c5bbe20fe0e0f5163e
Author: James Vega james...@debian.org
Date: Tue May 17 08:05:33 2011 -0400
debcheckout: Add $destdir as an argument to unpack_source
Previously, unpack_source was assuming the created directory would be based
on
the package name ($pkg). This assumption would fail if the user specified a
directory that wasn't the same as the package name.
Closes: #627030
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index d5511e0..b0fcf2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ devscripts (2.10.74) UNRELEASED; urgency=low
* getbuildlog:
+ Query the updated build log status pages.
+ Request the raw log file when downloading.
+ * debcheckout: Use the destination directory, not package name, when
+checking for where the checkout happened. (Closes: #627030)
-- James Vega james...@debian.org Sat, 14 May 2011 16:05:10 -0400
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index e570d5b..2ac4549 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -782,20 +782,21 @@ sub checkout_files() {
}
# download source package, unpack it, and merge its contents into the checkout
-sub unpack_source() {
-my ($pkg, $version, $origtgz_name, $unpack_source) = @_;
+sub unpack_source($) {
+my ($pkg, $version, $destdir, $origtgz_name, $unpack_source) = @_;
return 1 if ($unpack_source eq 'never');
return 1 if (defined $origtgz_name and $origtgz_name eq ''); # only really
relevant with URL on command line
+$destdir ||= $pkg;
# is this a debian-dir-only repository?
-unless (-d $pkg) {
- print STDERR debcheckout did not create the $pkg directory - this is
probably a bug\n;
+unless (-d $destdir) {
+ print STDERR debcheckout did not create the $destdir directory - this
is probably a bug\n;
return 0;
}
-my @repo_files = glob $pkg/*;
+my @repo_files = glob $destdir/*;
my $debian_only = 0;
-if (@repo_files == 1 and $repo_files[0] eq $pkg/debian) {
+if (@repo_files == 1 and $repo_files[0] eq $destdir/debian) {
$debian_only = 1;
}
@@ -1108,7 +1109,7 @@ EOF
$rc ||= 1;
exit($rc);
}
- unpack_source($pkg, $version, $origtgz_name, $unpack_source) or $rc = 1;
+ unpack_source($pkg, $version, $destdir, $origtgz_name, $unpack_source)
or $rc = 1;
}
exit($rc);
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.73-2-gab9083b
The following commit has been merged in the master branch:
commit 2e4b23e196c361406b3ee0176b39b8b7d87c01f8
Author: James Vega james...@debian.org
Date: Sun Apr 10 21:55:47 2011 -0400
getbuildlog: Download from the new buildd pages.
This allows downloading the raw build logs instead of logs wrapped in a big
pre.
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/getbuildlog.sh b/scripts/getbuildlog.sh
index 6b323f0..92a50a4 100644
--- a/scripts/getbuildlog.sh
+++ b/scripts/getbuildlog.sh
@@ -84,7 +84,7 @@ elif [ $VERSION = last-all ]; then
VERSION=[:~+.[:alnum:]-]+
fi
-PATTERN=fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGEver=$VERSIONarch=$ARCH\
+PATTERN=fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGEarch=$ARCHver=$VERSION\
stamp=[[:digit:]]+
getbuildlog() {
@@ -93,13 +93,13 @@ getbuildlog() {
trap rm -f $ALL_LOGS EXIT INT QUIT TERM
-wget -q -O $ALL_LOGS $BASE/build.php?pkg=$PACKAGE
+wget -q -O $ALL_LOGS $BASE/status/logs.php?pkg=$PACKAGE
# Put each href in $ALL_LOGS on a separate line so that $PATTERN
# matches only one href. This is required because grep is greedy.
sed -i -e s/href=\/\nhref=\/g $ALL_LOGS
# Quick-and-dirty unescaping
-sed -i -e s/%2B/\+/g -e s/%3A/:/g -e s/%7E/~/g $ALL_LOGS
+sed -i -e s/amp;/\/g -e s/%2B/\+/g -e s/%3A/:/g -e s/%7E/~/g
$ALL_LOGS
# If only the last version was requested, extract and sort
# the listed versions and determine the highest
@@ -116,8 +116,8 @@ getbuildlog() {
print $versions[0][0]; ' | sed -e s/\+/\\\+/g
)
- NEWPATTERN=fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGE\
-ver=$LASTVERSION\arch=$ARCHstamp=[[:digit:]]+
+ NEWPATTERN=fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGE\
+arch=$ARCHver=$LASTVERSIONstamp=[[:digit:]]+
else
NEWPATTERN=$PATTERN
fi
@@ -128,7 +128,7 @@ ver=$LASTVERSION\arch=$ARCHstamp=[[:digit:]]+
arch=${match##*arch=}
arch=${arch%%*}
match=`echo $match | sed -e 's/\+/%2B/g'`
-wget -O ${PACKAGE}_${ver}_${arch}.log $BASE/$matchfile=log
+wget -O ${PACKAGE}_${ver}_${arch}.log $BASE/status/$matchraw=1
done
rm -f $ALL_LOGS
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.73-2-gab9083b
The following commit has been merged in the master branch: commit ab9083b6dc54ba8d311e76da11416626c2ff9bcf Merge: 24e6a34474a851206ba0439332b517678a88a071 2e4b23e196c361406b3ee0176b39b8b7d87c01f8 Author: James Vega james...@debian.org Date: Sat May 14 16:07:02 2011 -0400 getbuildlog: Use the updated build status pages to download raw logs. Signed-off-by: James Vega james...@debian.org diff --combined debian/changelog index 117b919,887fb94..d5511e0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,55 -1,4 +1,63 @@@ -devscripts (2.10.72) UNRELEASED; urgency=low ++devscripts (2.10.74) UNRELEASED; urgency=low ++ ++ * getbuildlog: +++ Query the updated build log status pages. +++ Request the raw log file when downloading. ++ ++ -- James Vega james...@debian.org Sat, 14 May 2011 16:05:10 -0400 ++ +devscripts (2.10.73) unstable; urgency=low + + [ James Vega ] + * uscan: ++ Use the correct path when repacking zip files. (Closes: #622889) ++ Make file show all matched file types instead of just the first. + (Closes: #574155) + * uupdate: Handle hidden files when the upstream archive doesn't contain its +files under one top-level directory. (Closes: #601945) + * bts: ++ Indicate version argument is optional for done command. (Closes: + #623567) ++ Silence warnings with (un)subscribe command when no email is specified. + (Closes: #626086) ++ Indicate email argument is optional for (un)subscribe commands. + * debsnap: ++ Add support for downloading binary packages. Thanks to Timo Juhani + Lindfors for the patch. (Closes: #587523) ++ Only download a file if it doesn't exist or its hashsum doesn't match + the one specified by snapshot.d.o. + * debchange: ++ Add -M option to use debian/control's Maintainer information. Thanks to + Modestas Vainius for the patch. (Closes: #560900) ++ Update recognized Ubuntu releases (- jaunty/karmic, + oneiric). + * dget: Improve wget()'s handling of file/copy URIs. Thanks to Adam +Borowski for the suggestions. ++ Allow relative paths for file/copy URIs. ++ Follow symlinks when copying/hard linking files from a local cache. + (Closes: #515852) ++ Call system() with a list of arguments to prevent shell interpolation of + the command. + + [ Benjamin Drung ] + * Add myself to uploaders. + * Wrap and sort lists in debian/control. (Closes: #577999) + * Switch to simple dh 8 rule. + * debcommit: Support for committing from debian/ when using bzr. Thanks to +Loïc Minier for the patch. (Closes: #580861) + * debian/control: Bump Standards-Version to 3.9.2 (no changes needed). + + [ Patrick Schoenfeld ] + * checkbashisms: +- add code to detect weither STDIN is a pipe and if so, write the lines + passed via stdin to a tempfile +- add tempfile filename to the list of files to process +- add logic to detect if filename is a tempfile and if so, use the string +(stdin) for filename display instead of the real filename. +(Closes: #586500) + + -- James Vega james...@debian.org Mon, 09 May 2011 22:42:12 -0400 + +devscripts (2.10.72) unstable; urgency=low [ James Vega ] * debuild: Use 3-argument form of open to suppress warnings about unused @@@ -70,12 -19,6 +78,12 @@@ (Closes: #597963) + Fix Use of uninitialized value warnings when processing certain version 1 watch files. ++ Fix various issues when repacking a zip to a tarball. Thanks to + Christian Kastner for the patch. (Closes: #615108) + - Run tar from within the temp directory to prevent getting a ‘./’ +archive member. + - Use root/root as the owner for the archive members to prevent leaking +the user's login. * Remove use of lzma command in favor of xz. (Closes: #599641) + debian/control: Remove lzma from Recommends. + uscan: Use xz to repack lzma tarballs. @@@ -95,8 -38,6 +103,8 @@@ + Remove experimental.debian.net, now that experimental logs show up on the normal buildd site. (Closes: #621758) + Remove temp file if the script exits early. + * licensecheck: Remove (the License) from check for Apache license. +Thanks to Dmitry Kurochkin for the suggestion. (Closes: #620902) [ Ron Lee ] * cowpoke: add a --return option that copies the build results back to a @@@ -106,7 -47,7 +114,7 @@@ * debcheckout: Correctly extract package name from svn://.../trunk/$pkg style URLs. - -- James Vega james...@debian.org Wed, 02 Mar 2011 00:07:34 -0500 + -- James Vega james...@debian.org Fri, 15 Apr 2011 00:21:57 -0400 devscripts (2.10.71) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Re: Python scripts in devscripts
On Thu, May 05, 2011 at 11:48:11PM +0200, Benjamin Drung wrote: I like to continue to discussion if Python scripts should be allowed in devscripts. There were some concerns raised: 1. Additional package dependency on python. 2. Maintainability. 3. Code duplication. Did I forgot a concern? No, but you've fairly assuaged my concerns. I'd like to get the current package uploaded soon and then we can start another ~1 month development cycle. We can take a look at merging some of the Ubuntu deltas (started looking over the patch today) and seeing what makes sense to pull in from u-d-t. We will have a session about this topic at UDS [1]. It would be nice if you could attend the meeting - either in person or remotely. I don't see a schedule there, but it's unlikely I'll be able to remotely attend unless it takes place outside of my work hours. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-24-g24e6a34
The following commit has been merged in the master branch: commit 24e6a34474a851206ba0439332b517678a88a071 Author: James Vega james...@debian.org Date: Mon May 9 22:42:37 2011 -0400 releasing version 2.10.73 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 7ca9221..117b919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -devscripts (2.10.73) UNRELEASED; urgency=low +devscripts (2.10.73) unstable; urgency=low [ James Vega ] * uscan: @@ -47,7 +47,7 @@ devscripts (2.10.73) UNRELEASED; urgency=low (stdin) for filename display instead of the real filename. (Closes: #586500) - -- Benjamin Drung bdr...@debian.org Wed, 04 May 2011 10:28:27 +0200 + -- James Vega james...@debian.org Mon, 09 May 2011 22:42:12 -0400 devscripts (2.10.72) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.10.73, created. v2.10.73
The annotated tag, v2.10.73 has been created at a1a7d91cb9c6ce4441c867bfa369cc08590965d7 (tag) tagging 24e6a34474a851206ba0439332b517678a88a071 (commit) replaces v2.10.72 tagged by James Vega on Mon May 9 22:43:14 2011 -0400 - Shortlog tagging version 2.10.73 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk3IpkIACgkQDb3UpmEybUAGqgCeJ/epw7sa1vAyDpnzXzRh4TVC aOAAn0SaEbUmpwCPi+TJEtuxzc7hqry/ =b7Hy -END PGP SIGNATURE- Benjamin Drung (6): Wrap and sort lists in debian/control. Add myself to uploaders. Switch to simple dh 8 rule. debcommit: Support for commiting from debian/ when using bzr. Fix typo: commiting - committing. debian/control: Bump Standards-Version to 3.9.2 (no changes needed). James Vega (14): uscan: Use the correct path when repacking zip files. Make file show all matched file types instead of just the first. uupdate: Correctly handle hidden files in upstream archives. bts: Indicate version argument is optional for done command. Add changelog entry for debsnap binary support. debsnap: Use sha1sum to check whether an existing file should be overwritten. debchange: Add -M option to use debian/control's Maintainer information. Update recognized Ubuntu releases (- jaunty/karmic, + oneiric). po4a update dget: Improve wget()'s handling of file/copy URIs. Merge remote-tracking branch 'origin/master' Silence warnings with (un)subscribe command when no email is specified. po4a update releasing version 2.10.73 Patrick Schoenfeld (2): checkbashisms: add stdin support Merge branch 'master' of git.debian.org:/git/devscripts/devscripts Timo Juhani Lindfors (2): Implement --binary and --architecture debsnap: add --binary/--architecture to man page --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-22-gdf14879
The following commit has been merged in the master branch:
commit df14879fbc1a1ab6b35e131ae8f32693658b2c93
Author: James Vega james...@debian.org
Date: Sun May 8 17:19:52 2011 -0400
Silence warnings with (un)subscribe command when no email is specified.
Closes: #626086
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index e063b8b..7ca9221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ devscripts (2.10.73) UNRELEASED; urgency=low
(Closes: #574155)
* uupdate: Handle hidden files when the upstream archive doesn't contain its
files under one top-level directory. (Closes: #601945)
- * bts: Indicate version argument is optional for done command. (Closes:
-#623567)
+ * bts:
++ Indicate version argument is optional for done command. (Closes:
+ #623567)
++ Silence warnings with (un)subscribe command when no email is specified.
+ (Closes: #626086)
++ Indicate email argument is optional for (un)subscribe commands.
* debsnap:
+ Add support for downloading binary packages. Thanks to Timo Juhani
Lindfors for the patch. (Closes: #587523)
diff --git a/scripts/bts.pl b/scripts/bts.pl
index 3bb1f31..2d76d3e 100755
--- a/scripts/bts.pl
+++ b/scripts/bts.pl
@@ -1997,7 +1997,7 @@ sub bts_noowner {
mailbts(bug $bug has no owner, noowner $bug);
}
-=item Bsubscribe Ibug Iemail
+=item Bsubscribe Ibug [Iemail]
Subscribe the given Iemail address to the specified Bbug report. If no
email
address is specified, the environment variable BDEBEMAIL or BEMAIL (in that
@@ -2012,7 +2012,8 @@ relevant emails and notifications. Use the unsubscribe
command to unsubscribe.
sub bts_subscribe {
my $bug=checkbug(shift) or die bts subscribe: subscribe to what bug?\n;
-my $email=lc(shift);
+my $email=shift;
+$email=lc($email) if defined $email;
if (defined $email and $email eq '!') { $email = undef; }
else {
$email ||= $ENV{'DEBEMAIL'};
@@ -2024,7 +2025,7 @@ sub bts_subscribe {
$bug . '-subscribe@' . $btsserver, $email);
}
-=item Bunsubscribe Ibug Iemail
+=item Bunsubscribe Ibug [Iemail]
Unsubscribe the given email address from the specified bug report. As with
subscribe above, if no email address is specified, the environment variables
@@ -2038,7 +2039,8 @@ to which you have to reply. Use the Bsubscribe command
to, well, subscribe.
sub bts_unsubscribe {
my $bug=checkbug(shift) or die bts unsubscribe: unsubscribe from what
bug?\n;
-my $email=lc(shift);
+my $email=shift;
+$email = lc($email) if defined $email;
if (defined $email and $email eq '!') { $email = undef; }
else {
$email ||= $ENV{'DEBEMAIL'};
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-21-gd3f6d1b
The following commit has been merged in the master branch:
commit ac6f5240b6e34310d244f608631e69e57a64c9c6
Author: James Vega james...@debian.org
Date: Wed May 4 22:49:07 2011 -0400
dget: Improve wget()'s handling of file/copy URIs.
+ Allow relative paths for file/copy URIs.
+ Follow symlinks when copying/hard linking files from a local cache.
(Closes: #515852)
+ Call system() with a list of arguments to prevent shell interpolation of
the command.
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 0782975..f82e7cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,13 @@ devscripts (2.10.73) UNRELEASED; urgency=low
+ Add -M option to use debian/control's Maintainer information. Thanks to
Modestas Vainius for the patch. (Closes: #560900)
+ Update recognized Ubuntu releases (- jaunty/karmic, + oneiric).
+ * dget: Improve wget()'s handling of file/copy URIs. Thanks to Adam
+Borowski for the suggestions.
++ Allow relative paths for file/copy URIs.
++ Follow symlinks when copying/hard linking files from a local cache.
+ (Closes: #515852)
++ Call system() with a list of arguments to prevent shell interpolation of
+ the command.
[ Benjamin Drung ]
* Add myself to uploaders.
diff --git a/scripts/dget.pl b/scripts/dget.pl
index 7fafb3d..23e4c05 100755
--- a/scripts/dget.pl
+++ b/scripts/dget.pl
@@ -27,6 +27,7 @@
# Later modifications: see debian/changelog
use strict;
+use Cwd qw(abs_path);
use IO::Dir;
use IO::File;
use Digest::MD5;
@@ -103,9 +104,14 @@ sub wget {
my ($file, $url) = @_;
# schemes not supported by all backends
-if ($url =~ m!^(file|copy)://(/.+)!) {
- if ($1 eq copy or not link($2, $file)) {
- system cp -a $2 $file;
+if ($url =~ m!^(file|copy):(.+)!) {
+ my $path = abs_path($2);
+ unless ($path) {
+ warn $progname: unable to resolve full path for $2: $!\n;
+ return 1;
+ }
+ if ($1 eq copy or not link($path, $file)) {
+ system 'cp', '-aL', $path, $file;
return $? 8;
}
return;
@@ -175,7 +181,7 @@ sub get_file {
print $progname: using $path/$file (hardlink)\n unless
$opt-{'quiet'};
} else {
print $progname: using $path/$file (copy)\n unless
$opt-{'quiet'};
- system cp -a $path/$file $file;
+ system 'cp', '-aL', $path/$file, $file;
}
last;
}
@@ -193,8 +199,9 @@ sub get_file {
# try apt-get if it is still not there
if (not -e $file and $file =~
m!^([a-z0-9.+-]{2,})_[^/]+\.(?:diff\.gz|tar\.gz)$!) {
- my $cmd = apt-get source --print-uris $1;
- my $apt = new IO::File($cmd |) or die $cmd: $!;
+ my @cmd = ('apt-get', 'source', '--print-uris', $1);
+ my $cmd = join ' ', @cmd;
+ open(my $apt, '-|', @cmd) or die $cmd: $!;
while($apt) {
if (/'(\S+)'\s+\S+\s+\d+\s+([\da-f]+)/i and $2 eq $md5sum) {
if (wget($file, $1)) {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-21-gd3f6d1b
The following commit has been merged in the master branch: commit d3f6d1b3f96bd6c1df5b63c10737a6195af770e5 Merge: ac6f5240b6e34310d244f608631e69e57a64c9c6 481fb55614cab4a6fbed2a78dcbee5cc20f87757 Author: James Vega james...@debian.org Date: Thu May 5 00:22:51 2011 -0400 Merge remote-tracking branch 'origin/master' diff --combined debian/changelog index f82e7cb,629fb55..e063b8b --- a/debian/changelog +++ b/debian/changelog @@@ -18,20 -18,14 +18,21 @@@ devscripts (2.10.73) UNRELEASED; urgenc + Add -M option to use debian/control's Maintainer information. Thanks to Modestas Vainius for the patch. (Closes: #560900) + Update recognized Ubuntu releases (- jaunty/karmic, + oneiric). + * dget: Improve wget()'s handling of file/copy URIs. Thanks to Adam +Borowski for the suggestions. ++ Allow relative paths for file/copy URIs. ++ Follow symlinks when copying/hard linking files from a local cache. + (Closes: #515852) ++ Call system() with a list of arguments to prevent shell interpolation of + the command. [ Benjamin Drung ] * Add myself to uploaders. * Wrap and sort lists in debian/control. (Closes: #577999) * Switch to simple dh 8 rule. - * debcommit: Support for commiting from debian/ when using bzr. Thanks to + * debcommit: Support for committing from debian/ when using bzr. Thanks to Loïc Minier for the patch. (Closes: #580861) + * debian/control: Bump Standards-Version to 3.9.2 (no changes needed). [ Patrick Schoenfeld ] * checkbashisms: @@@ -42,7 -36,7 +43,7 @@@ (stdin) for filename display instead of the real filename. (Closes: #586500) - -- Patrick Schoenfeld schoenf...@debian.org Thu, 21 Apr 2011 13:13:43 +0200 + -- Benjamin Drung bdr...@debian.org Wed, 04 May 2011 10:28:27 +0200 devscripts (2.10.72) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-15-gbcf5b91
The following commit has been merged in the master branch:
commit bcf5b91012270362523a7c9426fa025ada977a23
Author: James Vega james...@debian.org
Date: Sun May 1 22:09:10 2011 -0400
debchange: Add -M option to use debian/control's Maintainer information.
Closes: #560900
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 82a11e0..7496c94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ devscripts (2.10.73) UNRELEASED; urgency=low
Lindfors for the patch. (Closes: #587523)
+ Only download a file if it doesn't exist or its hashsum doesn't match
the one specified by snapshot.d.o.
+ * debchange: Add -M option to use debian/control's Maintainer information.
+Thanks to Modestas Vainius for the patch. (Closes: #560900)
[ Benjamin Drung ]
* Add myself to uploaders.
diff --git a/scripts/debchange.1 b/scripts/debchange.1
index 00fd9b1..0a3ebc7 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -327,6 +327,14 @@ Note that there may be some interesting interactions if
multi-maintainer mode is in use; you will probably wish to check the
changelog manually before uploading it in such cases.
.TP
+.BR \-\-controlmaint , \-M
+Use maintainer details from the \fIdebian/control\fR \fBMaintainer\fR field
+rather than relevant environment variables (\fBDEBFULLNAME\fR, \fBDEBEMAIL\fR,
+etc.). This option might be useful to restore details of the main maintainer
+in the changelog trailer after a bogus edit (e.g. when \fB\-m\fR was intended
+but forgot) or when releasing a package in the name of the main maintainer
+(e.g. the team).
+.TP
.BR \-\-\fR[\fBno\fR]\fBmainttrailer , \-t
If mainttrailer is set, it will avoid modifying the existing changelog
trailer line (i.e. the maintainer and date-stamp details), unless
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index f72f4dd..5885ebe 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -164,6 +164,8 @@ Options:
(default: do not)
-m, --maintmaint
Don\'t change (maintain) the maintainer details in the changelog entry
+ -M, --controlmaint
+ Use maintainer name and email from the debian/control Maintainer field
-t, --mainttrailer
Don\'t change (maintain) the trailer line in the changelog entry; i.e.
maintain the maintainer and date/time details
@@ -304,7 +306,7 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
# with older debchange versions.
my ($opt_help, $opt_version);
my ($opt_i, $opt_a, $opt_e, $opt_r, $opt_v, $opt_b, $opt_d, $opt_D, $opt_u,
$opt_force_dist);
-my ($opt_n, $opt_bn, $opt_qa, $opt_s, $opt_team, $opt_bpo, $opt_l, $opt_c,
$opt_m, $opt_create, $opt_package, @closes);
+my ($opt_n, $opt_bn, $opt_qa, $opt_s, $opt_team, $opt_bpo, $opt_l, $opt_c,
$opt_m, $opt_M, $opt_create, $opt_package, @closes);
my ($opt_news);
my ($opt_level, $opt_regex, $opt_noconf, $opt_empty);
@@ -342,6 +344,7 @@ GetOptions(help|h = \$opt_help,
'multimaint-merge!' = \$opt_multimaint_merge,
'multi-maint-merge!' = \$opt_multimaint_merge,
m|maintmaint = \$opt_m,
+ M|controlmaint = \$opt_M,
t|mainttrailer! = \$opt_t,
check-dirname-level=s = \$opt_level,
check-dirname-regex=s = \$opt_regex,
@@ -671,7 +674,7 @@ if (! exists $env{'DEBEMAIL'} or ! exists
$env{'DEBFULLNAME'}) {
}
# Now use the gleaned values to detemine our MAINTAINER and EMAIL values
-if (! $opt_m) {
+if (! $opt_m and ! $opt_M) {
if (exists $env{'DEBFULLNAME'}) {
$MAINTAINER = $env{'DEBFULLNAME'};
} elsif (exists $env{'NAME'}) {
@@ -716,13 +719,33 @@ if (! $opt_m) {
$EMAIL = $addr if $addr;
}
# Otherwise, $EMAIL retains its default value of the last changelog entry
-} # if (! $opt_m)
+} # if (! $opt_m and ! $opt_M)
+
+if ($opt_M) {
+if (-f 'debian/control') {
+ if (have_lpdc()) {
+ my $parser = Parse::DebControl-new;
+ my $deb822 = $parser-parse_file('debian/control', {stripComments
= 'true'});
+ my $maintainer = decode_utf8($deb822-[0]-{'Maintainer'});
+ if ($maintainer =~ /^(.*)\s+(.*)$/) {
+ $MAINTAINER = $1;
+ $EMAIL = $2;
+ } else {
+ fatal $progname: invalid debian/control Maintainer field
value\n;
+ }
+ } else {
+ fatal $progname: unable to get maintainer from debian/control:
$lpdc_broken\n;
+ }
+} else {
+ fatal Missing file debian/control;
+}
+}
#
if ($opt_auto_nmu eq 'yes' and ! $opt_v and ! $opt_l and ! $opt_s and
! $opt_team and ! $opt_qa and ! $opt_bpo and ! $opt_bn and ! $opt_n and !
$opt_c and
-! (exists $ENV{'CHANGELOG'} and length $ENV{'CHANGELOG'}) and
+! (exists $ENV{'CHANGELOG'} and length $ENV{'CHANGELOG'}) and ! $opt_M and
! $opt_create and ! $opt_a_passed and ! $opt_r and ! $opt_e
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-16-g6a802a4
The following commit has been merged in the master branch:
commit 6a802a4d4055d985edb438bcd59ff42c273bd0fd
Author: James Vega james...@debian.org
Date: Sun May 1 22:20:14 2011 -0400
Update recognized Ubuntu releases (- jaunty/karmic, + oneiric).
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 7496c94..0782975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ devscripts (2.10.73) UNRELEASED; urgency=low
Lindfors for the patch. (Closes: #587523)
+ Only download a file if it doesn't exist or its hashsum doesn't match
the one specified by snapshot.d.o.
- * debchange: Add -M option to use debian/control's Maintainer information.
-Thanks to Modestas Vainius for the patch. (Closes: #560900)
+ * debchange:
++ Add -M option to use debian/control's Maintainer information. Thanks to
+ Modestas Vainius for the patch. (Closes: #560900)
++ Update recognized Ubuntu releases (- jaunty/karmic, + oneiric).
[ Benjamin Drung ]
* Add myself to uploaders.
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 5885ebe..e523137 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -412,7 +412,7 @@ if (defined $opt_D) {
$warnings++ if not $opt_force_dist;
}
} elsif ($distributor eq 'Ubuntu') {
- unless ($opt_D =~
/^((dapper|hardy|jaunty|karmic|lucid|maverick|natty)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
+ unless ($opt_D =~
/^((dapper|hardy|lucid|maverick|natty|oneiric)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
warn $progname warning: Recognised distributions
are:\n{dapper,hardy,jaunty,karmic,lucid,maverick,natty}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n;
$warnings++ if not $opt_force_dist;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#515852: link() doesn't update relative symlinks
On Wed, Apr 20, 2011 at 04:04:31PM +0200, Adam Borowski wrote:
Not sure why this was reassigned from dget to dscverify,
Neither am I, retagged accordingly.
but, the problem is
caused by the following part in /usr/bin/dget:
if ($url =~ m!^(file|copy)://(/.+)!) {
if ($1 eq copy or not link($2, $file)) {
system cp -a $2 $file;
return $? 8;
}
return;
}
Hardlinking a symlink of course doesn't update its destination.
There are four bugs there:
1. (/.+) should be (.+) -- there's no reason relative urls shouldn't work
Relative URLs don't make much sense in a sources.list file. What would
they be relative to?
However, the file URI example in sources.list(5) suggests the format is
file:/absolute/path/to/file instead of the usual
file://relative/path or file:///absolute/path. I thought I had used
the latter formats before, but I may need to revisit that and see what
apt actually expects/apt-cache policy shows so we can update that
appropriately.
2. fallback cp should use -L
Agreed.
3. $2 in the link() calls should be `readlink -f $2` (modulo possible
quotes inside the string and the general uselessness of `` on an
user-provided string)
Cwd::realpath should be useful here.
4. the system() call will break on spaces or quotes in the passed URL.
should be system /bin/cp, -a, $2, $file
Yes, thanks.
--
James
GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org
signature.asc
Description: Digital signature
Bug#515852: link() doesn't update relative symlinks
On Sun, May 01, 2011 at 11:15:15PM -0400, James Vega wrote: On Wed, Apr 20, 2011 at 04:04:31PM +0200, Adam Borowski wrote: There are four bugs there: 1. (/.+) should be (.+) -- there's no reason relative urls shouldn't work Relative URLs don't make much sense in a sources.list file. What would they be relative to? I see the example was using a file URI specified by the user. A relative URI can make sense in this case, but I'll still need to check how apt's URIs are handled. However, the file URI example in sources.list(5) suggests the format is file:/absolute/path/to/file instead of the usual file://relative/path or file:///absolute/path. I thought I had used the latter formats before, but I may need to revisit that and see what apt actually expects/apt-cache policy shows so we can update that appropriately. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-17-g0334224
The following commit has been merged in the master branch: commit 03342240c599fefa1c139e6c40fff5e40e7b0493 Author: James Vega james...@debian.org Date: Sun May 1 22:54:51 2011 -0400 po4a update Signed-off-by: James Vega james...@debian.org diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index c16c722..034fabe 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: PACKAGE VERSION\n -POT-Creation-Date: 2011-04-15 04:17+\n +POT-Creation-Date: 2011-05-02 02:31+\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: LANGUAGE l...@li.org\n @@ -87,13 +87,13 @@ msgid Controls the timestamp format, as per Bdate(1). Defaults to \%H:%M:%S msgstr #. type: =item -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:257 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:47 ../scripts/dget.pl:585 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:246 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:257 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:55 ../scripts/dget.pl:585 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:246 #, no-wrap msgid B-h, B--help msgstr #. type: Plain text -#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:359 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:108 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47 +#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:367 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:108 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:85 ../scripts/who-uploads.1:47 msgid Display a help message and exit successfully. msgstr @@ -117,7 +117,7 @@ msgid msgstr #. type: SH -#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:109 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 +#: ../scripts/annotate-output.1:32 ../scripts/debsnap.1:117 ../scripts/rc-alert.1:119 ../scripts/whodepends.1:17 #, no-wrap msgid BUGS msgstr @@ -149,7 +149,7 @@ msgid msgstr #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4092 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:290 ../scripts/debc.1:115 ../scripts/debchange.1:435 ../scripts/debcheckout.pl:211 ../scripts/debclean.1:107 ../scripts/debcommit.pl:850 ../scripts/debdiff.1:215 ../scripts/debi.1:122 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:140 ../scripts/debsnap.1:91 ../scripts/debuild.1:410 ../scripts/dget.pl:639 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:329 ../scripts/tagpending.pl:149 ../scri pts/uscan.1:535 ../scripts/uupdate.1:170 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4092 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:263 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:98 ../scripts/dcontrol.pl:290 ../scripts/debc.1:115 ../scripts/debchange.1:443 ../scripts/debcheckout.pl:211 ../scripts/debclean.1:107 ../scripts/debcommit.pl:853 ../scripts/debdiff.1:215 ../scripts/debi.1:122 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:140 ../scripts/debsnap.1:99 ../scripts/debuild.1:410 ../scripts/dget.pl:639 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:73 ../scripts/grep-excuses.1:38 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:108 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:329 ../scripts/tagpending.pl:149 ../scri pts/uscan.1:535 ../scripts/uupdate.1:170 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap msgid SEE ALSO msgstr @@ -174,7 +174,7 @@ msgid msgstr #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:346 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:269 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-14-g639565e
The following commit has been merged in the master branch: commit 7e91dc0c892e3e70a2e0f258c3e15afca112e105 Author: Timo Juhani Lindfors timo.lindf...@iki.fi Date: Thu Apr 21 22:39:25 2011 +0300 debsnap: add --binary/--architecture to man page Signed-off-by: James Vega james...@debian.org diff --git a/scripts/debsnap.1 b/scripts/debsnap.1 index c7b249f..991df26 100644 --- a/scripts/debsnap.1 +++ b/scripts/debsnap.1 @@ -45,6 +45,14 @@ Report on the \fBdebsnap\fP configuration being used and progress during the download operation. Please always use this option when reporting bugs. .TP +.BR \-\-binary +Download binary packages instead of source packages. + +.TP +.BR \-a , \-\-architecture +Specify architecture of downloaded binary packages. Implies \-\-binary. + +.TP .BR \-h , \-\-help Show a summary of these options. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-14-g639565e
The following commit has been merged in the master branch:
commit adb84e9623399c8e0234e7b83eff39a9f5a83282
Author: Timo Juhani Lindfors timo.lindf...@iki.fi
Date: Sun Apr 17 15:16:32 2011 +0300
Implement --binary and --architecture
(closes: #587523).
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/debsnap.pl b/scripts/debsnap.pl
index eb4ee46..6176748 100755
--- a/scripts/debsnap.pl
+++ b/scripts/debsnap.pl
@@ -91,6 +91,11 @@ The following options are supported:
Default is ./source-package name
-f, --force Force overwriting an existing
destdir
+--binaryDownload binary packages instead of
+source packages
+-a architecture,
+--architecture architecture Specify architecture of binary
packages,
+implies --binary
Default settings modified by devscripts configuration files or command-line
options:
@@ -180,7 +185,7 @@ sub verbose($)
read_conf(@ARGV);
Getopt::Long::Configure('gnu_compat');
Getopt::Long::Configure('no_ignore_case');
-GetOptions(\%opt, 'verbose|v', 'destdir|d=s', 'force|f', 'help|h', 'version')
|| exit 1;
+GetOptions(\%opt, 'verbose|v', 'destdir|d=s', 'force|f', 'help|h', 'version',
'binary', 'architecture|a=s') || exit 1;
usage(0) if $opt{help};
usage(1) unless @ARGV;
@@ -193,7 +198,13 @@ if (@ARGV) {
$package eq '' usage(1);
-$opt{destdir} ||= source-$package;
+$opt{binary} ||= $opt{architecture};
+
+if ($opt{binary}) {
+$opt{destdir} ||= binary-$package;
+} else {
+$opt{destdir} ||= source-$package;
+}
my $baseurl = $opt{baseurl}/mr/package/$package/;
if (-d $opt{destdir}) {
@@ -203,6 +214,43 @@ if (-d $opt{destdir}) {
}
make_path($opt{destdir});
+if ($opt{binary}) {
+$baseurl = $opt{baseurl}/mr/binary/$package/;
+
+my $json_text = fetch_json_page($baseurl);
+unless ($json_text @{$json_text-{result}}) {
+ fatal Unable to retrieve information for $package from $baseurl.;
+}
+
+foreach my $version (@{$json_text-{result}}) {
+ if ($pkgversion) {
+ next if ($version-{binary_version} = $pkgversion);
+ }
+
+ my $src_json =
fetch_json_page($opt{baseurl}/mr/package/$version-{source}/$version-{version}/binfiles/$version-{name}/$version-{binary_version}?fileinfo=1);
+
+ unless ($src_json) {
+ warn $progname: No binary packages found for $package version
$version-{binary_version}\n;
+ $warnings++;
+ }
+
+ foreach my $result (@{$src_json-{result}}) {
+ if ($opt{architecture}) {
+ next if ($result-{architecture} ne $opt{architecture});
+ }
+ my $fileinfo = @{$src_json-{fileinfo}{$result-{hash}}}[0];
+ my $file_url = $opt{baseurl}/file/$result-{hash};
+ my $file_name = basename($fileinfo-{name});
+ verbose Getting file $file_name: $file_url;
+ LWP::Simple::getstore($file_url, $opt{destdir}/$file_name);
+ }
+}
+if ($warnings) {
+ exit 2;
+}
+exit 0;
+}
+
my $json_text = fetch_json_page($baseurl);
unless ($json_text @{$json_text-{result}}) {
fatal Unable to retrieve information for $package from $baseurl.;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.72-14-g639565e
The following commit has been merged in the master branch: commit 75039e1a447dd869c0672f1ac1bf6de9376bece7 Author: James Vega james...@debian.org Date: Mon Apr 25 20:38:51 2011 -0400 Add changelog entry for debsnap binary support. Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index f7afd29..654df76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ devscripts (2.10.73) UNRELEASED; urgency=low files under one top-level directory. (Closes: #601945) * bts: Indicate version argument is optional for done command. (Closes: #623567) + * debsnap: Add support for download binary packages. Thanks to Timo Juhani +Lindfors for the patch. (Closes: #587523) [ Benjamin Drung ] * Add myself to uploaders. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.10.72, created. v2.10.72
The annotated tag, v2.10.72 has been created at 5dd898d1cbb8ca92ac06a2367cd3e1c9d9920084 (tag) tagging ad4b45f126185c28c50f54d94a44ce0cb45d7842 (commit) replaces v2.10.71 tagged by James Vega on Fri Apr 15 00:22:38 2011 -0400 - Shortlog tagging version 2.10.72 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk2nyA4ACgkQDb3UpmEybUB+pgCgmtVFujgKIdVRlaXoPKRmL7lC 9OEAoIRgJovBPYHkHcU8AkChMqpp9tBD =FjHb -END PGP SIGNATURE- Bdale Garbee (1): cowpoke: add a --return option that copies build results to a directory Christian Kastner (1): uscan: ZIP repacking fixes Christoph Berg (1): debcheckout: Correctly extract package name from svn://.../trunk/$pkg style URLs. David Prévot (1): Partial manual pages convention review Felipe Sateler (2): Add an option to gain root privileges Abort mk-build-deps if installation of package fails James Vega (19): debuild: Use 3-argument form of open to suppress warnings about unused symbols. Reduce set of packages in Recommends. Merge remote-tracking branch 'origin/master' uscan: Let unzip convert text files to native line endings. Remove use of lzma command in favor of xz. uscan: Avoid Use of uninitialized value warning. uscan: Parse responses from FTP sites on a line-by-line basis. Merge remote-tracking branch 'origin/master' uscan: Fix warnings when processing certain version 1 watch files. Add changelog entry for typography updates, #616630. pts-subscribe: Do not perform arithmetic comparison of --until argument. mk-build-deps: Add MKBUILDDEPS_ROOTCMD configuration variable debchange: Change lenny-backports - squeeze-backports in the man page. getbuildlog: Remove experimental.debian.net from download list. getbuildlog: Remove temp file if script exits early. Add changelog entry for Christian's uscan patch and use glob instead of ls. licensecheck: Remove (the License) from check for Apache license. po4a update releasing version 2.10.72 Ron (1): cowpoke: minor editorial changes to cowpoke.1 --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Re: Introduction / Maintenance of devscripts/ubuntu-dev-tools (was: Re: Introduction)
(keeping Stefano in Cc in case he's not subscribed) On Tue, Apr 19, 2011 at 09:14:30AM +0200, Patrick Schoenfeld wrote: On Mon, Apr 18, 2011 at 11:25:12PM +0200, Benjamin Drung wrote: I like to get involved in the maintenance of devscripts. There are some things that I like to do: Reduce the delta to the Ubuntu package, refreshing the packaging (simplifying debian/rules for example), adding test cases that are run on package build time, and last but not least getting scripts from ubuntu-dev-tools into devscripts. Sounds good, mostly. However, there is still a decision to be made if we'd like to have python scripts in devscripts. I know that James expressed concerns about the maintenance of python scripts by the current team. Aside from what I mentioned on the -devel thread, I'm also hesitant due to wanting to reduce code duplication. For Wheezy, I'd like to work on consolidating common code among the scripts into relevant Perl modules. The first piece being the code that handles parsing the config files, command-line options and environment variables to determine a script's runtime parameters. This code is complex and replicated in essentially every perl script, so having a more declarative interface with the complexity hidden from the main scripts should be helpful. Having a common language makes this easier and I've been considering looking over some of the shell scripts to see which ones would most benefit from being re-written in Perl to take advantage of the future config module as well as modules from libdpkg-perl. Personally I would not mind python scripts in devscripts. As all in the team know my time is very limited, so my opinion shouldn't be crucial, but I wouldn't mind to support them aswell. I'm not strictly opposed to Python, but I'd like to weigh its use against goals such as the above. If we do start including Python scripts, then IMO we would need feature parity between the devscripts libraries in both languages. I should be getting some more time[0] to devote to Debian starting in May, so I can provide more guidance around this as well as working more on the bug backlog. Is there any documentation or guidelines that I should know? Should I push my changes into the master branch and they will get reviewed there or should I use a separate branch? Usually maintenance of devscripts follows common sense and is centered around communication in the IRC channel. If you plan to make bigger changes which may have a greater impact its probably a good idea to create a local branch and merge it into master after intensive testing and after coordination with the team. Agreed. If you'd like to stage changes in a personal repository on git.d.o and get reviews first as you get familiar with devscripts and Perl, I'd be glad to work with that. That's something I can assure I'll give time to on a routine basis. PS: Does a list archive exists of this mailing list? There used to be one on teams.debian.net AFAIR, but its down since a while. However mailarchive.com is keeping an archive [1].. Interesting, mailarchive seems to do a better job than gmane[1]. For some reason gmane doesn't seem to get responses to bugs. [0]: I'm finishing my current semester of school at the end of April, but I'm also getting closer to my wedding, the preparation of which may partially offset time gained from not being in school. [1]: http://news.gmane.org/gmane.linux.debian.devel.devscripts -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-28-g3e5031a
The following commit has been merged in the master branch:
commit 3e5031a5049686e75f7516888ef8e4b3e2c5f495
Author: James Vega james...@debian.org
Date: Tue Apr 19 23:00:23 2011 -0400
Make file show all matched file types instead of just the first.
Closes: #574155
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index cb9d717..b32c323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
devscripts (2.10.73) UNRELEASED; urgency=low
- * uscan: Use the correct path when repacking zip files. (Closes: #622889)
+ * uscan:
++ Use the correct path when repacking zip files. (Closes: #622889)
++ Make file show all matched file types instead of just the first.
+ (Closes: #574155)
-- James Vega james...@debian.org Tue, 19 Apr 2011 21:57:10 -0400
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 46a50ed..a8052b1 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1386,8 +1386,7 @@ EOF
}
if ($newfile_base =~ /\.(tar\.gz|tgz|tar\.bz2|tbz2?)$/) {
- my $filetype = `file $destdir/$newfile_base`;
- $filetype =~ s%^\.\./\Q$newfile_base\E: %%;
+ my $filetype = `file -b -k $destdir/$newfile_base`;
unless ($filetype =~ /compressed data/) {
warn $progname warning: $destdir/$newfile_base does not appear to
be a compressed file;\nthe file command says: $filetype\nNot processing this
file any further!\n;
return 1;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-29-gb0b99e3
The following commit has been merged in the master branch:
commit b0b99e36d9ea4cc07406d6959bd2674bb8a32977
Author: James Vega james...@debian.org
Date: Wed Apr 20 00:29:35 2011 -0400
uupdate: Correctly handle hidden files in upstream archives.
Closes: #601945
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index b32c323..d704694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ devscripts (2.10.73) UNRELEASED; urgency=low
+ Use the correct path when repacking zip files. (Closes: #622889)
+ Make file show all matched file types instead of just the first.
(Closes: #574155)
+ * uupdate: Handle hidden files when the upstream archive doesn't contain its
+files under one top-level directory. (Closes: #601945)
-- James Vega james...@debian.org Tue, 19 Apr 2011 21:57:10 -0400
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index 52fa478..0fa60e9 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -308,7 +308,8 @@ if [ $PATCH ]; then
fi
X=${X%.xz}
;;
- *)if [ -r $OPWD/$PATCH ]; then
+ *)
+ if [ -r $OPWD/$PATCH ]; then
CATPATCH=cat $OPWD/$PATCH
else
CATPATCH=cat ../$PATCH
@@ -685,6 +686,9 @@ else
# Otherwise, we put them into a new directory
mkdir $PACKAGE-$SNEW_VERSION
mv $TEMP_DIR/* $PACKAGE-$SNEW_VERSION
+ if ls $TEMP_DIR/.[!.]* /dev/null 21 ; then
+ mv $TEMP_DIR/.[!.]* $PACKAGE-$SNEW_VERSION
+ fi
fi
rm -rf $TEMP_DIR
cp -a $PACKAGE-$SNEW_VERSION $PACKAGE-$SNEW_VERSION.orig
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#622561: dcmd conflates orig with tarballs
On Wed, Apr 13, 2011 at 12:08:07AM +, Clint Adams wrote: I suggest either detecting that a pacage is non-native and changing the endswith checks to .orig.tar.gz, .orig.tar.bz2, .orig.tar.xz, or filtering out .debian.tar.gz from the dcmd --orig output. Ah, v3 source format is rather neglected. My take is: a) --orig should select orig.tar.$compression (whatever's supported), and any component tarballs for v3 source. b) --tar should select any tarball c) a new option(?) for debian.tar.$compression, since it doesn't really fall under --diff -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#622212: devscripts: uscan problems when HTTPS_PROXY or https_proxy is set
On Mon, Apr 11, 2011 at 02:57:28PM +1200, Francois Marier wrote: When trying to scan the following watch file: version=3 https://launchpad.net/mahara/+download http://launchpad.net/mahara/[\d.]+/[\d.]+/\+download/mahara-([\d.]+).tar.gz I get proxy errors: $ uscan --verbose --report -- Scanning for watchfiles in . -- Found watchfile in ./mahara/debian -- In debian/watch, processing watchfile line: https://launchpad.net/mahara/+download http://launchpad.net/mahara/[\d.]+/[\d.]+/\+download/mahara-([\d.]+).tar.gz uscan warning: In watchfile debian/watch, reading webpage https://launchpad.net/mahara/+download failed: 500 Can't connect to localhost:8118 (Bad service '8118/') This is likely a problem with libwww-perl. If you run “uscan --debug --report 21|grep 'requesting URL'”, you'll see the exact URLs that uscan is using. I imagine you'll see the same results using /usr/bin/GET (which libwww-perl provides) to fetch those URLs. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-23-gb3df3f9
The following commit has been merged in the master branch: commit 223aec4c806f86f442251bfe7519abee3043774f Author: James Vega james...@debian.org Date: Sun Apr 10 15:06:26 2011 -0400 getbuildlog: Remove experimental.debian.net from download list. Closes: #621758 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index d70aa24..da1064c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,9 @@ devscripts (2.10.72) UNRELEASED; urgency=low + Show modified configuration variables in usage. * debchange: Correct the backport name in the man page. Thanks to Salvatore Bonaccorso for the patch. (Closes: #617675) + * getbuildlog: ++ Remove experimental.debian.net, now that experimental logs show up on + the normal buildd site. (Closes: #621758) [ Ron Lee ] * cowpoke: add a --return option that copies the build results back to a diff --git a/scripts/getbuildlog.sh b/scripts/getbuildlog.sh index 3f7963f..291a192 100644 --- a/scripts/getbuildlog.sh +++ b/scripts/getbuildlog.sh @@ -139,4 +139,3 @@ ver=$LASTVERSION\arch=$ARCHstamp=[[:digit:]]+ getbuildlog http://buildd.debian.org getbuildlog http://buildd.debian-ports.org -getbuildlog http://experimental.debian.net -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-23-gb3df3f9
The following commit has been merged in the master branch:
commit b8d55114fc1df1a0824ed5d22694a58e48f486a1
Author: James Vega james...@debian.org
Date: Sun Apr 10 21:55:10 2011 -0400
getbuildlog: Remove temp file if script exits early.
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index da1064c..887fb94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ devscripts (2.10.72) UNRELEASED; urgency=low
* getbuildlog:
+ Remove experimental.debian.net, now that experimental logs show up on
the normal buildd site. (Closes: #621758)
++ Remove temp file if the script exits early.
[ Ron Lee ]
* cowpoke: add a --return option that copies the build results back to a
diff --git a/scripts/getbuildlog.sh b/scripts/getbuildlog.sh
index 291a192..6b323f0 100644
--- a/scripts/getbuildlog.sh
+++ b/scripts/getbuildlog.sh
@@ -91,6 +91,8 @@ getbuildlog() {
BASE=$1
ALL_LOGS=`mktemp`
+trap rm -f $ALL_LOGS EXIT INT QUIT TERM
+
wget -q -O $ALL_LOGS $BASE/build.php?pkg=$PACKAGE
# Put each href in $ALL_LOGS on a separate line so that $PATTERN
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#620902: devscripts: [licensecheck] remove (the License) from the Apache license regex
On Mon, Apr 11, 2011 at 08:04:06AM +0400, Dmitry Kurochkin wrote: Hi James. On Sun, 10 Apr 2011 23:51:36 -0400, James Vega james...@debian.org wrote: On Tue, Apr 05, 2011 at 04:19:39AM +0400, Dmitry Kurochkin wrote: The Apache license rexex in licensecheck version 2.10.71 is: /under the Apache License, Version ([^ ]+) \(the License\)/ Since the stuff in parenthesis is meant for the following text which may not be present in many customized preambles, it should not be matched for. Have you seen instances where that was the problem? Yes, the polygraph [1] package I am trying to get accepted to Debian. See discussion on the debian-mentors mailing list [2]. Thanks for the pointer. It seems like the more relevant problem is that the regular expression doesn't contain the double quotes around License, like official boilerplate does. The quotes are missing indeed. But apparently licensecheck does some preprocessing on the input because the current regex successfully matches the official boilerplate. Ah, right. We strip out everything except a basic set of characters to ease matching. This may not be the most relevant problem, but we have at least one example when it would help. And since fixing the issue is easy, I believe it should be done. Yeah, it's just a balance between being flexible enough to catch variations but not too flexible that there are significant false positives. If it had been an issue with the quoting, I would have preferred to fix that instead. Seeing as that isn't an issue and the modified check isn't too broad, I'll fix it. Thanks for the suggestion. :) -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-24-g0caa62c
The following commit has been merged in the master branch:
commit 0caa62c351d358a8c4c0e4304dd84396f10e8416
Author: James Vega james...@debian.org
Date: Mon Apr 11 00:27:07 2011 -0400
licensecheck: Remove (the License) from check for Apache license.
Closes: #620902
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index e39512e..ef00bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ devscripts (2.10.72) UNRELEASED; urgency=low
+ Remove experimental.debian.net, now that experimental logs show up on
the normal buildd site. (Closes: #621758)
+ Remove temp file if the script exits early.
+ * licensecheck: Remove (the License) from check for Apache license.
+Thanks to Dmitry Kurochkin for the suggestion. (Closes: #620902)
[ Ron Lee ]
* cowpoke: add a --return option that copies the build results back to a
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 1f7f423..7d542e4 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -475,7 +475,7 @@ sub parselicense($) {
$license = Perl $license;
}
-if ($licensetext =~ /under the Apache License, Version ([^ ]+) \(the
License\)/) {
+if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
$license = Apache (v$1) $license;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-19-g4a7297b
The following commit has been merged in the master branch:
commit 3a411aee9c5ffd5fff0772b8b1074279a655ecd1
Author: Felipe Sateler fsate...@debian.org
Date: Fri Feb 25 20:41:24 2011 -0300
Add an option to gain root privileges
If the install switch is provided and the new option used, the tool is
used to gain root privilegeAdd an option to gain root privileges
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 192b084..23c357a 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -84,6 +84,11 @@ Show a summary of options.
Show version and copyright information.
+=item B-s, B--root-cmd
+
+Use the specified tool to gain root privileges before installing.
+Ignored if not used with the install switch.
+
=back
=head1 AUTHOR
@@ -110,6 +115,7 @@ my $opt_remove=0;
my ($opt_help, $opt_version, $opt_arch, $opt_dep, $opt_indep);
my $control;
my $install_tool;
+my $root_cmd;
my @packages;
my @deb_files;
@@ -153,6 +159,7 @@ GetOptions(help|h = \$opt_help,
arch|a=s = \$opt_arch,
build-dep|B = \$opt_dep,
build-indep|A = \$opt_indep,
+ root-cmd|s=s = \$root_cmd,
)
or pod2usage({ -exitval = 1, -verbose = 0 });
@@ -247,8 +254,14 @@ if ($opt_install) {
push @deb_files, $file;
}
-system 'dpkg', '--unpack', @deb_files;
-system shellwords($install_tool), '-f', 'install';
+if($root_cmd) {
+system shellwords($root_cmd), 'dpkg', '--unpack', @deb_files;
+system shellwords($root_cmd), shellwords($install_tool), '-f',
'install';
+}
+else {
+system 'dpkg', '--unpack', @deb_files;
+system shellwords($install_tool), '-f', 'install';
+}
if ($opt_remove) {
foreach my $file (@deb_files) {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-19-g4a7297b
The following commit has been merged in the master branch: commit 28f030dea734e1640f25d81f45d4da155f318d39 Author: James Vega james...@debian.org Date: Sat Apr 2 17:40:59 2011 -0400 pts-subscribe: Do not perform arithmetic comparison of --until argument. Closes: #620194 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 5aeccc0..c5076d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ devscripts (2.10.72) UNRELEASED; urgency=low + uupdate: Use xz to handle lzma-compressed files. * More typography updates for man pages. Thanks to David Prévot for the patch. (Closes: #616630) + * pts-subscribe: Do not perform arithmetic comparison of --until argument. +Thanks to Stefano Rivera for the patch. (Closes: #620194) [ Ron Lee ] * cowpoke: add a --return option that copies the build results back to a diff --git a/scripts/pts-subscribe.sh b/scripts/pts-subscribe.sh index 0cb7413..60a80c7 100755 --- a/scripts/pts-subscribe.sh +++ b/scripts/pts-subscribe.sh @@ -154,7 +154,7 @@ if [ $ACTION = unsubscribe ]; then echo $ACTION $pkg $DEBEMAIL | mail p...@qa.debian.org else # Check for an at command -if [ $PTS_UNTIL != forever -a $PTS_UNTIL -ne 0 ]; then +if [ $PTS_UNTIL != forever -a $PTS_UNTIL != 0 ]; then if ! command -v at /dev/null 21; then echo $PROGNAME: Could not find the \at\ command; you must have the 2 echo \at\ package installed to run this script. 2 -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-19-g4a7297b
The following commit has been merged in the master branch: commit 510c31da35ef118b2c080ef8c78294aa43549c22 Author: David Prévot da...@tilapin.org Date: Sat Mar 5 23:15:40 2011 -0400 Partial manual pages convention review Signed-off-by: James Vega james...@debian.org diff --git a/scripts/checkbashisms.1 b/scripts/checkbashisms.1 index 2e8eb82..a180766 100644 --- a/scripts/checkbashisms.1 +++ b/scripts/checkbashisms.1 @@ -26,11 +26,11 @@ options for stricter checking. Show a summary of options. .TP .BR \-\-newline , \-n -Check for echo \-n usage (non POSIX but required by Debian Policy 10.4.) +Check for \fBecho \-n\fR usage (non POSIX but required by Debian Policy 10.4.) .TP .BR \-\-posix , \-p Check for issues which are non POSIX but required to be supported by Debian -Policy 10.4 (implies \-n). +Policy 10.4 (implies \fB\-n\fR). .TP .BR \-\-force , \-f Force each script to be checked, even if it would normally not be (for @@ -41,8 +41,8 @@ shell wrapper). Highlight lines which, whilst they do not contain bashisms, may be useful in determining whether a particular issue is a false positive which may be ignored. -For example, the use of $BASH_ENV may be preceded by checking -whether $BASH is set. +For example, the use of \fB$BASH_ENV\fR may be preceded by checking +whether \fB$BASH\fR is set. .TP .BR \-\-version , \-v Show version and copyright information. @@ -61,5 +61,5 @@ unreadable or not found. The warning message will give details. .BR lintian (1). .SH AUTHOR \fBcheckbashisms\fR was originally written as a shell script by Yann Dirson -dir...@debian.org and rewritten in Perl with many more features by -Julian Gilbey j...@debian.org. +\fidir...@debian.org\fR and rewritten in Perl with many more features by +Julian Gilbey \fi...@debian.org\fR. diff --git a/scripts/debchange.1 b/scripts/debchange.1 index 6cb0bca..18582e6 100644 --- a/scripts/debchange.1 +++ b/scripts/debchange.1 @@ -23,7 +23,7 @@ temporary file, \fBdebchange\fR will exit without touching the existing changelog. \fBNote that the changelog is assumed to be encoded with the UTF-8 encoding. If it is not, problems may occur.\fR Please see the \fBiconv\fR(1) manpage to find out how to convert -changelogs from legacy encodings. Finally, a changelog or NEWS +changelogs from legacy encodings. Finally, a \fIchangelog\fR or \fINEWS\fR file can be created from scratch using the \fB\-\-create\fR option described below. .PP @@ -56,9 +56,9 @@ directory. A warning will be issued if the log file is found but a successful upload is not recorded. This may be because the previous upload was performed with a version of \fBdupload\fR prior to 2.1 or because the upload failed. The alternate \fIchangelog\fR heuristic assumes the package has -been released unless its changelog contains \fIUNRELEASED\fR in the +been released unless its changelog contains \fBUNRELEASED\fR in the distribution field. If this heuristic is enabled then the distribution will -default to \fIUNRELEASED\fR in new changelog entries, and the +default to \fBUNRELEASED\fR in new changelog entries, and the \fB\-\-mainttrailer\fR option described below will be automatically enabled. This can be useful if a package can be released by different maintainers, or if you do not keep the upload logs. @@ -111,11 +111,11 @@ causing potential problems, it will examine the name of the parent directory once it finds the \fIdebian/changelog\fR file, and check that the directory name corresponds to the package name. Precisely how it does this is controlled by two configuration file variables -DEVSCRIPTS_CHECK_DIRNAME_LEVEL and DEVSCRIPTS_CHECK_DIRNAME_REGEX, and +\fBDEVSCRIPTS_CHECK_DIRNAME_LEVEL\fR and \fBDEVSCRIPTS_CHECK_DIRNAME_REGEX\fR, and their corresponding command-line options \fB\-\-check-dirname-level\fR and \fB\-\-check-dirname-regex\fR. .PP -DEVSCRIPTS_CHECK_DIRNAME_LEVEL can take the following values: +\fBDEVSCRIPTS_CHECK_DIRNAME_LEVEL\fR can take the following values: .TP .B 0 Never check the directory name. @@ -129,20 +129,20 @@ Always check the directory name. .PP The directory name is checked by testing whether the current directory name (as determined by \fBpwd\fR(1)) matches the regex given by the -configuration file option DEVSCRIPTS_CHECK_DIRNAME_REGEX or by the +configuration file option \fBDEVSCRIPTS_CHECK_DIRNAME_REGEX\fR or by the command line option \fB\-\-check-dirname-regex\fR \fIregex\fR. Here \fIregex\fR is a Perl regex (see \fBperlre\fR(3perl)), which will be -anchored at the beginning and the end. If \fIregex\fR contains a '/', +anchored at the beginning and the end. If \fIregex\fR contains a '\fB/\fR', then it must match the full directory path. If not, then it must match the full directory name. If \fIregex\fR contains the string -\'PACKAGE', this will be replaced by the source package name, as +\'\fBPACKAGE\fR', this will be replaced by the source package name, as determined from
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-19-g4a7297b
The following commit has been merged in the master branch:
commit ca265a061beffcb081d91189d7020bab80b9292f
Author: Felipe Sateler fsate...@debian.org
Date: Fri Feb 25 20:51:45 2011 -0300
Abort mk-build-deps if installation of package fails
Signed-off-by: James Vega james...@debian.org
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 23c357a..6f303e4 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -256,11 +256,15 @@ if ($opt_install) {
if($root_cmd) {
system shellwords($root_cmd), 'dpkg', '--unpack', @deb_files;
+die(dpkg call failed\n) if ( ($?8) != 0 );
system shellwords($root_cmd), shellwords($install_tool), '-f',
'install';
+die(install call failed\n) if ( ($?8) != 0 );
}
else {
system 'dpkg', '--unpack', @deb_files;
+die(dpkg call failed\n) if ( ($?8) != 0 );
system shellwords($install_tool), '-f', 'install';
+die(install call failed\n) if ( ($?8) != 0 );
}
if ($opt_remove) {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#618535: devscripts: uscan should offer generic --repack-with argument
On Wed, Mar 16, 2011 at 01:15:07AM -0400, Daniel Kahn Gillmor wrote: One approach would be to have a --repack-with argument to uscan that would indicate a user-supplied command to run. the command would take two arguments: filename and version -- filename would be the name of the file that uscan fetched, and version would be the corresponding cleaned-up debian version number. It would execute in the .. directory. Wouldn't specifying this script as the third parameter on the watchfile line, where uupdate commonly is, be the same thing? $ cat watch version=3 some://url/pattern debian repackscript -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#615108: [uscan] Fixes for repacking ZIP files
On Fri, Feb 25, 2011 at 08:42:40PM +0100, Christian Kastner wrote: When repacking ZIP files, because of the way uscan invokes tar, the current directory '.' (dot) is always included in the resulting tar archive. We do that to ensure that everything unpacked from the zip file is included in the resulting tar file (e.g., a hidden file at the top-level of the unpacked tree). Unpacking such an archive has the side effect of tar attempting to change the permissions of the cwd, as easily reproduced by unpacking such a tarball from within the /tmp directory. Regular users get an error, root has the permissions of /tmp changed. Another minor issue is that the user and group name are leaked into the archive, instead of using the neutral 'root'. These are issues, though. Instead of your suggested solution for the first one, I think using tar's --transform argument to remove the leading ./ may be cleaner. The fix for the second issue looks good. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-7-g7b39a6c
The following commit has been merged in the master branch:
commit 563f6ae2376c852c22d5a960ff1a4547ac33973b
Author: James Vega james...@debian.org
Date: Sun Mar 20 13:14:53 2011 -0400
Reduce set of packages in Recommends.
Closes: #605102, #610310, LP#485264
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 33cd57a..2a92fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ devscripts (2.10.72) UNRELEASED; urgency=low
* debuild: Use 3-argument form of open to suppress warnings about unused
symbols. (Closes: #606054)
+ * Cleanup Recommends to avoid pulling in as many packages by default. The
+remaining Recommends are relevant to the more commonly used scripts or
+functionality. Relationships removed from Recommends were either added to
+Suggests if it makes sense to call some attention to them or were removed
+from debian/control completely. (Closes: #605102, #610310, LP: #485264)
-- James Vega james...@debian.org Wed, 02 Mar 2011 00:07:34 -0500
diff --git a/debian/control b/debian/control
index 02efa9d..1a95a43 100644
--- a/debian/control
+++ b/debian/control
@@ -14,15 +14,13 @@ Package: devscripts
Architecture: any
Depends: dpkg-dev (= 1.15.4.1), perl, ${shlibs:Depends}, ${misc:Depends}
Recommends: at, curl | wget, dctrl-tools, debian-keyring, debian-maintainers,
- dput | dupload, equivs, fakeroot, gnupg, libauthen-sasl-perl,
- libcrypt-ssleay-perl, libparse-debcontrol-perl, libsoap-lite-perl,
- libterm-size-perl, libtimedate-perl, liburi-perl, libwww-perl,
- libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx,
- man-db, patch, patchutils, ssh-client, strace, unzip, wdiff, www-browser,
- subversion | cvs | darcs | tla | bzr | git-core | mercurial, lzma,
- xz-utils, sensible-utils, libjson-perl
-Suggests: build-essential, cvs-buildpackage, devscripts-el, gnuplot,
- libfile-desktopentry-perl, libnet-smtp-ssl-perl (= 1.01-2), mutt,
+ dput | dupload, equivs, fakeroot, gnupg, libcrypt-ssleay-perl,
+ libparse-debcontrol-perl, libsoap-lite-perl, liburi-perl, libwww-perl,
+ lintian, lsb-release, man-db, patch, patchutils, strace, unzip,
+ wdiff, lzma, xz-utils, sensible-utils, libjson-perl
+Suggests: bsd-mailx | mailx, build-essential, cvs-buildpackage, devscripts-el,
+ gnuplot, libauthen-sasl-perl, libtimedate-perl, libfile-desktopentry-perl,
+ libnet-smtp-ssl-perl, libterm-size-perl, libyaml-syck-perl, mutt, ssh-client,
svn-buildpackage, w3m
Description: scripts to make the life of a Debian Package maintainer easier
Contains the following scripts, dependencies/recommendations shown in
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-7-g7b39a6c
The following commit has been merged in the master branch: commit 9e79153f3dace2ef76777fc484bf9997f133f0f2 Merge: 563f6ae2376c852c22d5a960ff1a4547ac33973b a7500e84a96ad7e5196f4b179931447d7025fa5b Author: James Vega james...@debian.org Date: Sun Mar 20 13:17:55 2011 -0400 Merge remote-tracking branch 'origin/master' Conflicts: debian/changelog Signed-off-by: James Vega james...@debian.org diff --combined debian/changelog index 2a92fe4,90fd139..a896f47 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,13 +1,18 @@@ devscripts (2.10.72) UNRELEASED; urgency=low + [ James Vega ] * debuild: Use 3-argument form of open to suppress warnings about unused symbols. (Closes: #606054) + * Cleanup Recommends to avoid pulling in as many packages by default. The +remaining Recommends are relevant to the more commonly used scripts or +functionality. Relationships removed from Recommends were either added to +Suggests if it makes sense to call some attention to them or were removed +from debian/control completely. (Closes: #605102, #610310, LP: #485264) + [ Ron Lee ] + * cowpoke: add a --return option that copies the build results back to a + directory somewhere. (Closes: #614268) + -- James Vega james...@debian.org Wed, 02 Mar 2011 00:07:34 -0500 devscripts (2.10.71) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-7-g7b39a6c
The following commit has been merged in the master branch: commit d54a93c0d8b878fb294edbe6f6d12da55e64325d Author: James Vega james...@debian.org Date: Sun Mar 20 13:20:15 2011 -0400 uscan: Let unzip convert text files to native line endings. Closes: #618513 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index a896f47..08b12c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ devscripts (2.10.72) UNRELEASED; urgency=low functionality. Relationships removed from Recommends were either added to Suggests if it makes sense to call some attention to them or were removed from debian/control completely. (Closes: #605102, #610310, LP: #485264) + * uscan: Let unzip convert text files to native line endings when repacking. +Thanks to Daniel Kahn Gilmor for the suggestion. (Closes: #618513) [ Ron Lee ] * cowpoke: add a --return option that copies the build results back to a diff --git a/scripts/uscan.pl b/scripts/uscan.pl index b69170d..264bf8e 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1369,7 +1369,7 @@ EOF my $newfile_base_gz = $1.tar.gz; my $tempdir = tempdir ( uscan, TMPDIR = 1, CLEANUP = 1 ); - system(unzip -q -d $tempdir $destdir/$newfile_base; GZIP=-9 tar -C $tempdir -czf $destdir/$newfile_base_gz .) == 0 + system(unzip -q -a -d $tempdir $destdir/$newfile_base; GZIP=-9 tar -C $tempdir -czf $destdir/$newfile_base_gz .) == 0 or die(Repacking from zip to tar.gz failed\n); unlink $destdir/$newfile_base; $newfile_base = $newfile_base_gz; -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-7-g7b39a6c
The following commit has been merged in the master branch:
commit 47fa1a60e645e74dae458c0d2b97efc4da8a43de
Author: James Vega james...@debian.org
Date: Sun Mar 20 13:40:01 2011 -0400
Remove use of lzma command in favor of xz.
Closes: #599641
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 08b12c5..60e99a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ devscripts (2.10.72) UNRELEASED; urgency=low
from debian/control completely. (Closes: #605102, #610310, LP: #485264)
* uscan: Let unzip convert text files to native line endings when repacking.
Thanks to Daniel Kahn Gilmor for the suggestion. (Closes: #618513)
+ * Remove use of lzma command in favor of xz. (Closes: #599641)
++ debian/control: Remove lzma from Recommends.
++ uscan: Use xz to repack lzma tarballs.
++ uupdate: Use xz to handle lzma-compressed files.
[ Ron Lee ]
* cowpoke: add a --return option that copies the build results back to a
diff --git a/debian/control b/debian/control
index 1a95a43..18afab6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Recommends: at, curl | wget, dctrl-tools, debian-keyring,
debian-maintainers,
dput | dupload, equivs, fakeroot, gnupg, libcrypt-ssleay-perl,
libparse-debcontrol-perl, libsoap-lite-perl, liburi-perl, libwww-perl,
lintian, lsb-release, man-db, patch, patchutils, strace, unzip,
- wdiff, lzma, xz-utils, sensible-utils, libjson-perl
+ wdiff, xz-utils, sensible-utils, libjson-perl
Suggests: bsd-mailx | mailx, build-essential, cvs-buildpackage, devscripts-el,
gnuplot, libauthen-sasl-perl, libtimedate-perl, libfile-desktopentry-perl,
libnet-smtp-ssl-perl, libterm-size-perl, libyaml-syck-perl, mutt, ssh-client,
@@ -117,7 +117,7 @@ Description: scripts to make the life of a Debian Package
maintainer easier
transitions for which uploads to unstable are currently blocked
[libwww-perl, libyaml-syck-perl]
- uscan: scan upstream sites for new releases of packages
-[libcrypt-ssleay-perl, libwww-perl, unzip, lzma, xz-utils]
+[libcrypt-ssleay-perl, libwww-perl, unzip, xz-utils]
- uupdate: integrate upstream changes into a source package [patch]
- whodepends: check which maintainers' packages depend on a package
- who-uploads: determine the most recent uploaders of a package to the Debian
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 264bf8e..2c62bc3 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1346,7 +1346,7 @@ EOF
if ($repack and $newfile_base =~ /^(.*)\.(tar\.lzma|tlz(?:ma?)?)$/) {
print -- Repacking from lzma to gzip\n if $verbose;
my $newfile_base_gz = $1.tar.gz;
- system(lzma -cd $destdir/$newfile_base | gzip -n -9
$destdir/$newfile_base_gz) == 0
+ system(xz -F lzma -cd $destdir/$newfile_base | gzip -n -9
$destdir/$newfile_base_gz) == 0
or die repacking from lzma to gzip failed\n;
unlink $destdir/$newfile_base;
$newfile_base = $newfile_base_gz;
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index e90787e..52fa478 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -265,7 +265,7 @@ if [ $PATCH ]; then
case $PATCH in
*.gz) CATPATCH=zcat $PATCH; X=${X%.gz};;
*.bz2) CATPATCH=bzcat $PATCH; X=${X%.bz2};;
- *.lzma) CATPATCH=lzcat $PATCH; X=${X%.lzma};;
+ *.lzma) CATPATCH=xz -F lzma -dc $PATCH; X=${X%.lzma};;
*.xz) CATPATCH=xzcat $PATCH; X=${X%.xz};;
*) CATPATCH=cat $PATCH;;
esac
@@ -294,9 +294,9 @@ if [ $PATCH ]; then
;;
*.lzma)
if [ -r $OPWD/$PATCH ]; then
- CATPATCH=lzcat $OPWD/$PATCH
+ CATPATCH=xz -F lzma -dc $OPWD/$PATCH
else
- CATPATCH=lzcat ../$PATCH
+ CATPATCH=xz -F lzma -dc ../$PATCH
fi
X=${X%.lzma}
;;
@@ -701,7 +701,7 @@ else
elif [ -r ../${PACKAGE}_$SVERSION.diff.lzma ]; then
DIFF=../${PACKAGE}_$SVERSION.diff.lzma
DIFFTYPE=diff
- DIFFCAT=lzcat
+ DIFFCAT=xz -F lzma -dc
elif [ -r ../${PACKAGE}_$SVERSION.diff.xz ]; then
DIFF=../${PACKAGE}_$SVERSION.diff.xz
DIFFTYPE=diff
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.71-7-g7b39a6c
The following commit has been merged in the master branch:
commit 7b39a6cf3b45d526a264ba9b08ac7123772acf85
Author: James Vega james...@debian.org
Date: Sun Mar 20 14:55:35 2011 -0400
uscan: Avoid Use of uninitialized value warning.
Closes: #600909
Signed-off-by: James Vega james...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 60e99a8..0637fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,12 @@ devscripts (2.10.72) UNRELEASED; urgency=low
functionality. Relationships removed from Recommends were either added to
Suggests if it makes sense to call some attention to them or were removed
from debian/control completely. (Closes: #605102, #610310, LP: #485264)
- * uscan: Let unzip convert text files to native line endings when repacking.
-Thanks to Daniel Kahn Gilmor for the suggestion. (Closes: #618513)
+ * uscan:
++ Let unzip convert text files to native line endings when repacking.
+ Thanks to Daniel Kahn Gilmor for the suggestion. (Closes: #618513)
++ Avoid Use of uninitialized value warning when URL doesn't have
+ / after the host. Thanks to Mats Erik Andersson for the patch.
+ (Closes: #600909)
* Remove use of lzma command in favor of xz. (Closes: #599641)
+ debian/control: Remove lzma from Recommends.
+ uscan: Use xz to repack lzma tarballs.
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2c62bc3..6b5e4fb 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1499,7 +1499,10 @@ sub recursive_regex_dir ($$$) {
$base =~ m%^(\w+://[^/]+)/(.*)$%;
my $site = $1;
-my @dirs = split /(\/)/, $2;
+my @dirs = ();
+if (defined $2) {
+ @dirs = split /(\/)/, $2;
+}
my $dir = '/';
foreach my $dirpattern (@dirs) {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#618513: devscripts: uscan --repack should pass -a to unzip
On Tue, Mar 15, 2011 at 04:31:36PM -0400, Daniel Kahn Gillmor wrote: When upstream distributes source as a .zip (PKZIP) file, sometimes the files are stored with MSDOS line-endings, and are marked as text within the archive. uscan should pass unzip the -a flag to convert these text files to the native line endings. I'm looking at packaging Peter Gutmann's cryptlib (http://cryptlib.com/downloads/), which observes these conventions. uscan's default behavior produces a bunch of .c files with CR/LF line endings. With the attached patch, the line endings are normal. Since this patch only changes the repacked files that are marked as text, it should not have any adverse effects on binary data. This relies on zip properly identifying files as text/binary, which it may not do perfectly, as the man page calls out. I'd wager that *nix tools are pretty good at handling non-native line endings (at least better than my experience with Windows tools), so is it necessary to do the conversion? Have you run into issues with CR/LF line ending files that prompted this patch? I'm not opposed to using the patch, but I'd be interested in whether the potential mis-identification happens frequently enough that auto-converting is more hassle than it's worth. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
[SCM] Git repository for devscripts branch, master, updated. v2.10.70-14-g6511923
The following commit has been merged in the master branch: commit 6511923e551139bbd284954e5e83e1f2799efad2 Author: James Vega james...@debian.org Date: Sat Feb 19 11:23:31 2011 -0500 releasing 2.10.71 Signed-off-by: James Vega james...@debian.org diff --git a/debian/changelog b/debian/changelog index 8d7c913..a637ed8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -devscripts (2.10.71) UNRELEASED; urgency=low +devscripts (2.10.71) unstable; urgency=low [ Christoph Berg ] * debcommit (git): Don't treat no files to commit as an error when called @@ -29,7 +29,7 @@ devscripts (2.10.71) UNRELEASED; urgency=low * cowpoke: try to rsync source files to the build host. (Closes: #610072) Thanks to Joachim Breitner for the idea and initial patch. - -- Patrick Schoenfeld schoenf...@debian.org Fri, 18 Feb 2011 14:10:22 +0100 + -- James Vega james...@debian.org Sat, 19 Feb 2011 11:23:20 -0500 devscripts (2.10.70) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.10.71, created. v2.10.71
The annotated tag, v2.10.71 has been created at 9f1f8d29f000ad7486ba385156cf1e17f94d3a1d (tag) tagging 6511923e551139bbd284954e5e83e1f2799efad2 (commit) replaces v2.10.70 tagged by James Vega on Sat Feb 19 11:24:16 2011 -0500 - Shortlog Version 2.10.71 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABEDAAYFAk1f7rAACgkQDb3UpmEybUAjPACcDn8i1Bwp3fMiQmMQ1O8adQIs /3YAn03uEsh+rPaVwV5zkAyxQy5cbyto =OMAN -END PGP SIGNATURE- Christoph Berg (2): debcommit (git): Don't treat no files to commit as an error when called with --release, otherwise it is not possible to tag after the final build. Add some comments to make reading the code easier James Vega (10): bts: Use Pod::Text to remove POD markup before displaying the help. dget: Ignore IO::File errors from local cache when a URL is given. Add Closes for formatting of bts' help output. bts: Document whitespace is required around the dot/comma separating command stanzas. build-rdeps: Remove hard-coded path for grep-dctrl. build-rdeps: Correct a few debug prints debchange: Require an argument for the --allow-lower-version option. debchange: Require saving the changelog when using --closes. po4a update releasing 2.10.71 Patrick Schoenfeld (1): build-rdeps: Update release_pattern for the new InRelease release files, which apt began downloading in newer versions instead of the Release file. (Closes: #613941) Ron (1): cowpoke: try to rsync the source files to the build host --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#592893: bts: support summary 0 to add new summary to bugs
On Fri, Aug 13, 2010 at 07:26:09PM +0200, Olivier Berger wrote: the bts command supports the summary option. Debbugs implements summary 0 control messages which allow to add a new summary to a bug instead of refering to a past message (undocumented feature... see #540219 for example). It would be great if the bts command could be passed summary 0 'a new summary message' which would generate a mail to control containing the summary 0 command and a next paragraph containing 'a new summary message'. Hmm, it wouldn't be too bad to add this, but I'm not sure it'd be very useful until #530559 is fixed. Otherwise, you end up with a message to the bug with the useless subject summary nnn 0. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
Bug#595893: print message when mail not sent
On Tue, Sep 07, 2010 at 10:07:20AM +0800, jida...@jidanni.org wrote: $ bts reassign 595812 apt, forcemerge 595691 595812 bts reassign: version number forcemerge contains no digits! Well, did it or did it not send mail? It did not. That's why the command errored out. Also, as mentioned in the man page, bts sends a mail to the BTS control address not a mail for each command. Oh I see. I need a space before the comma. Well OK, then please remind about the space here on the man page: Good point. I'll add clarification since it may be missed just by looking at the command structured specified in the synopsis/usage. Or better yet, don't require the space! If we didn't, then you couldn't use a dot or comma anywhere in your command. That would be rather inconvenient. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega james...@debian.org signature.asc Description: Digital signature
