Author: adsb
Date: 2009-03-02 19:38:14 +0000 (Mon, 02 Mar 2009)
New Revision: 1833
Modified:
trunk/debian/changelog
trunk/scripts/debuild.pl
Log:
debuild: Support bzip2 and lzma compressed orig tarballs.
(Closes: #473974)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-03-02 19:28:09 UTC (rev 1832)
+++ trunk/debian/changelog 2009-03-02 19:38:14 UTC (rev 1833)
@@ -8,6 +8,8 @@
differences were found, debdiff will now exit with a status of 1, as
per debdiff(1).
+ Support bzip2 and lzma compressed orig tarballs. (Closes: #473969)
+ * debuild: Support bzip2 and lzma compressed orig tarballs.
+ (Closes: #473974)
* licensecheck:
+ Document --no-conf.
+ Fix an uninitialised variable warning when --no-conf is used. Thanks.
Modified: trunk/scripts/debuild.pl
===================================================================
--- trunk/scripts/debuild.pl 2009-03-02 19:28:09 UTC (rev 1832)
+++ trunk/scripts/debuild.pl 2009-03-02 19:38:14 UTC (rev 1833)
@@ -972,11 +972,16 @@
($sversion=$version) =~ s/^\d+://;
($uversion=$sversion) =~ s/-[a-z0-9+\.]+$//i;
$dsc = "${pkg}_${sversion}.dsc";
- my $origtgz = "${pkg}_${uversion}.orig.tar.gz";
+ my $orig_prefix = "${pkg}_${uversion}.orig.tar";
my $origdir = basename(cwd()) . ".orig";
if (! $binaryonly and $tgz_check and $uversion ne $sversion
- and ! -f "../$origtgz" and ! -d "../$origdir") {
- print STDERR "This package has a Debian revision number but there does
not seem to be\nan appropriate original tar file or .orig directory in the
parent directory;\n(expected $origtgz or $origdir)\ncontinue anyway? (y/n) ";
+ and ! -f "../${orig_prefix}.bz2" and ! -f "../${orig_prefix}.lzma"
+ and ! -f "../${orig_prefix}.gz" and ! -d "../$origdir") {
+ print STDERR "This package has a Debian revision number but there does"
+ . " not seem to be\nan appropriate original tar file or .orig"
+ . " directory in the parent directory;\n(expected one of"
+ . " ${orig_prefix}.gz, ${orig_prefix}.bz2,\n${orig_prefix}.lzma or"
+ . " $origdir)\ncontinue anyway? (y/n) ";
my $ans = <STDIN>;
exit 1 unless $ans =~ /^y/i;
}
--
To unsubscribe, send mail to [email protected].
