The following commit has been merged in the master branch:
commit d54a93c0d8b878fb294edbe6f6d12da55e64325d
Author: James Vega <[email protected]>
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 <[email protected]>
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 ( "uscanXXXX", 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 [email protected].
