Package: devscripts
Version: 2.10.71
Severity: normal
Tags: patch
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.
--dkg
-- Package-specific info:
--- /etc/devscripts.conf ---
RMADISON_DEFAULT_URL=debian,ubuntu
--- ~/.devscripts ---
Not present
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing'), (200, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.37-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages devscripts depends on:
ii dpkg-dev 1.15.8.10 Debian package development tools
ii libc6 2.11.2-11 Embedded GNU C Library: Shared lib
ii perl 5.10.1-17 Larry Wall's Practical Extraction
Versions of packages devscripts recommends:
ii at 3.1.12-1 Delayed job execution and batch pr
ii bsd-mailx [mailx] 8.1.2-0.20100314cvs-1 simple mail user agent
ii bzr 2.3.0-6 easy to use distributed version co
ii curl 7.21.3-1 Get a file from an HTTP, HTTPS or
ii cvs 1:1.12.13-12 Concurrent Versions System
ii dctrl-tools 2.18 Command-line tools to process Debi
ii debian-keyring [de 2011.03.03 GnuPG keys of Debian Developers
ii dput 0.9.6.1 Debian package upload tool
ii dupload 2.7.0 utility to upload Debian packages
ii equivs 2.0.8 Circumvent Debian package dependen
ii fakeroot 1.14.5-1 Gives a fake root environment
ii git [git-core] 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii git-core 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii gnupg 1.4.11-3 GNU privacy guard - a free PGP rep
ii iceape-browser [ww 2.0.12-1 Iceape Navigator (Internet browser
ii iceweasel [www-bro 4.0~rc1-1 Web browser based on Firefox
ii konqueror [www-bro 4:4.4.5-2 advanced file manager, web browser
ii libauthen-sasl-per 2.1500-1 Authen::SASL - SASL Authentication
ii libcrypt-ssleay-pe 0.57-2 Support for https protocol in LWP
ii libjson-perl 2.50-1 module for manipulating JSON-forma
ii libparse-debcontro 2.005-2 Easy OO parsing of Debian control-
ii libsoap-lite-perl 0.712-2 Perl implementation of a SOAP clie
ii libterm-size-perl 0.2-4+b1 Perl extension for retrieving term
ii libtimedate-perl 1.2000-1 collection of modules to manipulat
ii liburi-perl 1.58-1 module to manipulate and access UR
ii libwww-perl 5.837-1 simple and consistent interface to
ii libyaml-syck-perl 1.17-1 Perl module providing a fast, ligh
ii links [www-browser 2.3~pre1-1 Web browser running in text mode
ii lintian 2.4.3 Debian package checker
ii lsb-release 3.2-27 Linux Standard Base version report
ii lzma 4.43-14 Compression method of 7z format in
ii mailutils [mailx] 1:2.2+dfsg1-3 GNU mailutils utilities for handli
ii man-db 2.5.9-4 on-line manual pager
ii mercurial 1.7.5-1 scalable distributed version contr
ii openssh-client [ss 1:5.8p1-2 secure shell (SSH) client, for sec
ii patch 2.6.1-1 Apply a diff file to an original
ii patchutils 0.3.2-1 Utilities to work with patches
ii sensible-utils 0.0.6 Utilities for sensible alternative
ii strace 4.5.20-2 A system call tracer
ii subversion 1.6.16dfsg-1 Advanced version control system
ii unzip 6.0-4 De-archiver for .zip files
ii wdiff 0.6.3-1 Compares two files word by word
ii wget 1.12-2.1 retrieves files from the web
ii xz-utils 5.0.0-2 XZ-format compression utilities
Versions of packages devscripts suggests:
ii build-essential 11.5 Informational list of build-essent
pn cvs-buildpackage <none> (no description available)
ii devscripts-el 34.1 Emacs wrappers for the commands in
ii gnuplot 4.4.0-1.1 A command-line driven interactive
ii libfile-desktopentry-perl 0.04-2 Perl module to handle freedesktop
ii libnet-smtp-ssl-perl 1.01-3 Perl module providing SSL support
pn mutt <none> (no description available)
ii svn-buildpackage 0.8.3 helper programs to maintain Debian
pn w3m <none> (no description available)
-- no debconf information
--- /usr/bin/uscan~ 2011-02-19 11:26:30.000000000 -0500
+++ /usr/bin/uscan 2011-03-15 16:16:48.000000000 -0400
@@ -1369,7 +1369,7 @@
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;
