The following commit has been merged in the master branch:
commit 47fa1a60e645e74dae458c0d2b97efc4da8a43de
Author: James Vega <[email protected]>
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 <[email protected]>
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 [email protected].
