Your message dated Tue, 06 Apr 2010 04:27:58 +0000
with message-id <[email protected]>
and subject line Bug#568615: fixed in devscripts 2.10.62
has caused the Debian Bug report #568615,
regarding devscripts: [uupdate] Please add support for .xz and .7z (patch)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
568615: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568615
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: devscripts
Version: 2.10.61
Severity: wishlist
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I want uupdate to work with .xz and .7z upstream archive (some upstream
use .7z now, it's quite effective for fonts archive - 90% better than gz),
so made a quick patch for that. I hope this would be included.
And I think this is not needed to add to --repack option for uscan.
- --
Regards,
Hideki Yamane
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkttGXsACgkQIu0hy8THJkvqeACeLLH4U9q1jZPOIfhzCzcjW5PX
2qkAoLL9lV5aRzSmV8AM7MMX1HEhoq9G
=crf3
-----END PGP SIGNATURE-----
diff -urN devscripts-2.10.61.orig/scripts/uupdate.1 devscripts-2.10.61/scripts/uupdate.1
--- devscripts-2.10.61.orig/scripts/uupdate.1 2010-01-03 12:20:42.000000000 +0900
+++ devscripts-2.10.61/scripts/uupdate.1 2010-02-06 15:58:49.000000000 +0900
@@ -20,11 +20,11 @@
.PP
Currently supported source code file types are \fI.tar.gz\fR,
\fI.tar.bz2\fR, \fI.tar.Z\fR, \fI.tgz\fR, \fI.tar\fR, \fI.tar.lzma\fR
-and \fI.zip\fR
+\fI.tar.xz\fR, \fI.zip\fR and \fI.7z\fR
archives. Also supported are already unpacked source code archives;
simply give the path of the source code directory. Supported patch
file types are \fBgzip\fR-compressed, \fBbzip2\fR-compressed,
-\fBlzma\fR-compressed and
+\fBlzma\fR-compressed, \fBxz\fR-compressed and
uncompressed patch files. The file types are identified by the file
names, so they must use the standard suffixes.
.PP
diff -urN devscripts-2.10.61.orig/scripts/uupdate.sh devscripts-2.10.61/scripts/uupdate.sh
--- devscripts-2.10.61.orig/scripts/uupdate.sh 2010-01-03 12:20:42.000000000 +0900
+++ devscripts-2.10.61/scripts/uupdate.sh 2010-02-06 16:11:54.000000000 +0900
@@ -48,7 +48,7 @@
"Usage for a new archive:
$PROGNAME [options] <new upstream archive> [<version>]
For a patch file:
- $PROGNAME [options] --patch|-p <patch>[.gz|.bz2|.lzma]
+ $PROGNAME [options] --patch|-p <patch>[.gz|.bz2|.lzma|.xz]
Options are:
--upstream-version <version>, -v <version>
specify version number of upstream package
@@ -56,10 +56,10 @@
which command to be used to become root
for package-building
--pristine, -u Source is pristine upstream source and should be
- copied to <pkg>_<version>.orig.tar.{gz|bz2|lzma}; not valid
+ copied to <pkg>_<version>.orig.tar.{gz|bz2|lzma|xz}; not valid
for patches
--no-symlink Copy new upstream archive to new location
- as <pkg>_<version>.orig.tar.{gz|bz2|lzma} instead of making a
+ as <pkg>_<version>.orig.tar.{gz|bz2|lzma|xz} instead of making a
symlink
--no-conf, --noconf
Don't read devscripts config files;
@@ -258,6 +258,7 @@
*.gz) CATPATCH="zcat $PATCH"; X=${X%.gz};;
*.bz2) CATPATCH="bzcat $PATCH"; X=${X%.bz2};;
*.lzma) CATPATCH="lzcat $PATCH"; X=${X%.lzma};;
+ *.xz) CATPATCH="xzcat $PATCH"; X=${X%.xz};;
*) CATPATCH="cat $PATCH";;
esac
;;
@@ -291,6 +292,14 @@
fi
X=${X%.lzma}
;;
+ *.xz)
+ if [ -r "$OPWD/$PATCH" ]; then
+ CATPATCH="xzcat $OPWD/$PATCH"
+ else
+ CATPATCH="xzcat ../$PATCH"
+ fi
+ X=${X%.xz}
+ ;;
*) if [ -r "$OPWD/$PATCH" ]; then
CATPATCH="cat $OPWD/$PATCH"
else
@@ -350,8 +359,11 @@
elif [ -r "../${PACKAGE}_$UVERSION.orig.tar.lzma" ]; then
OLDARCHIVE="${PACKAGE}_$UVERSION.orig.tar.lzma"
OLDARCHIVETYPE=lzma
+ elif [ -r "../${PACKAGE}_$UVERSION.orig.tar.xz" ]; then
+ OLDARCHIVE="${PACKAGE}_$UVERSION.orig.tar.xz"
+ OLDARCHIVETYPE=xz
else
- echo "$PROGNAME: can't find/read ${PACKAGE}_$UVERSION.orig.tar.{gz|bz2}" >&2
+ echo "$PROGNAME: can't find/read ${PACKAGE}_$UVERSION.orig.tar.{gz|bz2|lzma|xz}" >&2
echo "in the parent directory!" >&2
echo "Aborting...." >&2
exit 1
@@ -401,6 +413,12 @@
echo "aborting..." >&2
exit 1
}
+ elif [ "$OLDARCHIVETYPE" = xz ]; then
+ tar -J -xf ../$OLDARCHIVE || {
+ echo "$PROGNAME: can't untar $OLDARCHIVE;" >&2
+ echo "aborting..." >&2
+ exit 1
+ }
else
echo "$PROGNAME: internal error: unknown OLDARCHIVETYPE: $OLDARCHIVETYPE" >&2
exit 1
@@ -488,13 +506,17 @@
TYPE=bz2 ;;
*.orig.tar.lzma) X="${X%.orig.tar.lzma}"; UNPACK="tar --lzma -xf";
TYPE=lzma ;;
+ *.orig.tar.xz) X="${X%.orig.tar.xz}"; UNPACK="tar -J -xf";
+ TYPE=xz ;;
*.tar.gz) X="${X%.tar.gz}"; UNPACK="tar zxf"; TYPE=gz ;;
*.tar.bz2) X="${X%.tar.bz2}"; UNPACK="tar --bzip -xf"; TYPE=bz2 ;;
*.tar.lzma) X="${X%.tar.lzma}"; UNPACK="tar --lzma -xf"; TYPE=lzma ;;
+ *.tar.xz) X="${X%.tar.xz}"; UNPACK="tar -J -xf"; TYPE=xz ;;
*.tar.Z) X="${X%.tar.Z}"; UNPACK="tar zxf"; TYPE="" ;;
*.tgz) X="${X%.tgz}"; UNPACK="tar zxf"; TYPE=gz ;;
*.tar) X="${X%.tar}"; UNPACK="tar xf"; TYPE="" ;;
*.zip) X="${X%.zip}"; UNPACK="unzip"; TYPE="" ;;
+ *.7z) X="${X%.7z}"; UNPACK="7z x" TYPE="" ;;
*)
echo "$PROGNAME: sorry: Unknown archive type" >&2
exit 1
@@ -564,12 +586,21 @@
echo "already exists in the parent dir;" >&2
echo "please check on the situation before trying $PROGNAME again." >&2
exit 1
+ elif [ -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.xz" ] && \
+ [ "$(md5sum "${ARCHIVE_PATH}" | cut -d" " -f1)" != \
+ "$(md5sum "../${PACKAGE}_$SNEW_VERSION.orig.tar.xz" | cut -d" " -f1)" ]
+ then
+ echo "$PROGNAME: a different ${PACKAGE}_$SNEW_VERSION.orig.tar.xz" >&2
+ echo "already exists in the parent dir;" >&2
+ echo "please check on the situation before trying $PROGNAME again." >&2
+ exit 1
fi
if [ $UUPDATE_PRISTINE = yes -a -n "$TYPE" -a \
! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.gz" -a \
! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.bz2" -a \
- ! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.lzma" ]; then
+ ! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.lzma" -a \
+ ! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.xz" ]; then
if [ "$UUPDATE_SYMLINK_ORIG" = yes ]; then
echo "Symlinking to pristine source from ${PACKAGE}_$SNEW_VERSION.orig.tar.$TYPE..."
case $ARCHIVE_PATH in
@@ -602,8 +633,15 @@
cp "$ARCHIVE_PATH" "../${PACKAGE}_$SNEW_VERSION.orig.tar.lzma"
fi
;;
+ xz)
+ if [ "$UUPDATE_SYMLINK_ORIG" = yes ]; then
+ ln -s "$LINKARCHIVE" "../${PACKAGE}_$SNEW_VERSION.orig.tar.xz"
+ else
+ cp "$ARCHIVE_PATH" "../${PACKAGE}_$SNEW_VERSION.orig.tar.xz"
+ fi
+ ;;
*)
- echo "$PROGNAME: can't preserve pristine sources from non .tar.gz/.tar.bz2 upstream archive!" >&2
+ echo "$PROGNAME: can't preserve pristine sources from non .tar.{gz,bz2,lzma,xz} upstream archive!" >&2
echo "Continuing anyway..." >&2
;;
esac
@@ -656,6 +694,10 @@
DIFF="../${PACKAGE}_$SVERSION.diff.lzma"
DIFFTYPE=diff
DIFFCAT=lzcat
+ elif [ -r "../${PACKAGE}_$SVERSION.diff.xz" ]; then
+ DIFF="../${PACKAGE}_$SVERSION.diff.xz"
+ DIFFTYPE=diff
+ DIFFCAT=xzcat
elif [ -r "../${PACKAGE}_$SVERSION.debian.tar.gz" ]; then
DIFF="../${PACKAGE}_$SVERSION.debian.tar.gz"
DIFFTYPE=tar
@@ -668,6 +710,10 @@
DIFF="../${PACKAGE}_$SVERSION.debian.tar.lzma"
DIFFTYPE=tar
DIFFUNPACK="tar --lzma -xf"
+ elif [ -r "../${PACKAGE}_$SVERSION.debian.tar.xz" ]; then
+ DIFF="../${PACKAGE}_$SVERSION.debian.tar.xz"
+ DIFFTYPE=tar
+ DIFFUNPACK="tar -J -xf"
fi
if [ "$DIFFTYPE" = diff ]; then
@@ -742,7 +788,7 @@
elif [ "$DIFFTYPE" = tar ]; then
if [ -d debian ]; then
- echo "$PROGNAME warning: using a debian.tar.{gz|bz2|lzma} file in old Debian source," >&@
+ echo "$PROGNAME warning: using a debian.tar.{gz|bz2|lzma|xz} file in old Debian source," >&@
echo "but upstream also contains a debian/ directory!" >&2
if [ -e "debian.upstream" ]; then
echo "Please apply the diff by hand and take care with this." >&2
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.10.62
We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive:
devscripts_2.10.62.dsc
to main/d/devscripts/devscripts_2.10.62.dsc
devscripts_2.10.62.tar.gz
to main/d/devscripts/devscripts_2.10.62.tar.gz
devscripts_2.10.62_i386.deb
to main/d/devscripts/devscripts_2.10.62_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
James Vega <[email protected]> (supplier of updated devscripts package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
Format: 1.8
Date: Mon, 05 Apr 2010 23:00:39 -0400
Source: devscripts
Binary: devscripts
Architecture: source i386
Version: 2.10.62
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <[email protected]>
Changed-By: James Vega <[email protected]>
Description:
devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 507776 521642 537367 559549 563901 563918 564075 564443 565159 568473
568615 569062 570138 573092 575554 575820 576287
Changes:
devscripts (2.10.62) unstable; urgency=low
.
[ James Vega ]
* debcommit:
+ Fix a regression where only debian/ changes were being committed in CVS
repos. Thanks to Thomas Parmelan for the patch. (Closes: #563918)
+ Change '~' in version numbers to '.' when tagging in git. Thanks to
Damyan Ivanov. (Closes: #564075)
+ Treat darcs similar to hg with respect to determining the commit
message. Fold a single change into one line and spawn an editor if
multiple changes are detected. (Closes: #563901)
+ Ensure the commit message presented to the user for editing always has
an EOL on the last line.
* rmadison:
+ Add http://qa.debian.org/cgi-madison/madison.cgi, shorthand "udd", as a
known madison URL.
+ Detect an existing '?' in a URL and use '&' to append more cgi
parameters. Thanks to Raphael Geissert.
* chdist:
+ Add "use strict" and update for compliance.
+ Use Dpkg::Version to perform version comparisons.
* Devscripts::Versort: Use Dpkg::Version::version_compare instead of
invoking “dpkg --compare-versions”.
* debian/control:
+ Update Vcs-* to point to the new Git repository.
+ Remove Conflicts on kdesdk-scripts from Etch.
+ Bump Standards-Version to 3.8.4 -- no changes necessary.
* dcmd: Allow capital letters for the section and priority fields. (Closes:
#565159)
* debcheckout: Ensure "/git/" is at the start of the URL's path when
performing an authenticated clone of an Alioth git repo.
* uupdate:
+ Fix a typo which caused redirection of stdout to a file name "@".
(Closes: #569062)
+ Add support for xz compressed archives/patches and 7z archives. Thanks
to Hideki Yamane for the patch. (Closes: #568615)
+ Clarify wording when neither a diff nor a debian.tar is found. (Closes:
#575820)
* Update descriptions of debcommit to include darcs as a supported VCS.
(Closes: #570138)
* debchange:
+ Add maverick as a valid distribution. Thanks to Benjamin Drung for the
patch. (Closes: #576287)
+ Treat a trailing '+' like a trailing '~' when incrementing the version
number. (Closes: #521642)
* debuild: Expose two new variables (epoch-less source version, and upstream
version) to hooks. Thanks to gregor herrmann for the patch. (Closes:
573092)
* checkbashisms: Detect more Bash builtins -- readarray, mapfile, enable.
(Closes: #568473)
* dd-list: Clarify that --dctrl simply changes the expected format of the
list of packages. Thanks to Adeodato Simó for the suggestion. (Partially
addresses #509983)
* Add bash completion of package names for various Devscripts commands.
Thanks to Simon Paillard for the patch. (Closes: #507776)
* Document in dscverify(1) that /usr/share/keyrings/debian-maintainers.gpg
is one of the default keyrings.
* dget: Add description of the use of dscverify to the description in the
man page. (Closes: #537367)
* Add support for working with/recognizing xz archives to debchange,
debdiff, debuild, uscan.
* Use standalone “set -e” lines in maintainer scripts.
* Add debian/source/format with "3.0 (native)".
.
[ Patrick Schoenfeld ]
* nmudiff: Fix "[nmudiff] please include --tagpending option" by applying the
patch from Gregor Herrmann. Thanks. (Closes: #559549)
* build-rdeps:
+ Add some documentation to the manpage, which emphasizes on the fact that
the tool has some external dependencies (namely apt Sources files)
+ Add a proper argument passing to test_for_valid_component() so that
it really gets the filename and not the Release file entry.
+ Add a check to test_for_valid_component() to test if a given Sources
file actually exists and otherwise print a more meaningful warning.
(Closes: #564443)
.
[ Adam D. Barratt ]
* debchange: Sanitise list of distributions. Remove {sarge,etch}-backports
and sarge-volatile, none of which accept uploads any more.
.
[ Martin Zobel-Helas ]
* checkbashisms: Fix typo spotted by Dann Frazier. (Closes: #575554)
Checksums-Sha1:
0b78b23782ac50495cbe5601226865bb03bad856 1429 devscripts_2.10.62.dsc
f0552fbafe76309d0b0307efe7cd6d2012ec1d7c 691740 devscripts_2.10.62.tar.gz
9b086e439adaf74b79f440f13a670dc3b70d6570 597912 devscripts_2.10.62_i386.deb
Checksums-Sha256:
14304814299e183313d3ae92a6b14b311330766cbdd102b83f459ded9f6d22b3 1429
devscripts_2.10.62.dsc
64cd533f6ece97535040eb435b35926a6b95b3ed65c43ea908b648fc409ec3e7 691740
devscripts_2.10.62.tar.gz
a98b0b8a49c551c7a9008bd6af2dae0c5c52ae25ed13015225cfbaa5a34761d4 597912
devscripts_2.10.62_i386.deb
Files:
ff3a5b0aa91757c2b6f7c5ae45d9c8c8 1429 devel optional devscripts_2.10.62.dsc
4b436cc26b3fcbf77a5beac52938c1d5 691740 devel optional
devscripts_2.10.62.tar.gz
c1185c14e52aabce206e722aee5c03fd 597912 devel optional
devscripts_2.10.62_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEAREDAAYFAku6pKEACgkQDb3UpmEybUDPVgCgiq6QBvI8SV3yMLKf/0/7mUPB
kYwAnRkv/WIIxYZxlFluLONfNJVJ+g85
=PkiY
-----END PGP SIGNATURE-----
--- End Message ---
