dpkg-buildpackage: Fix build message for non-gz compressed sources

Closes: #458519

diff --git a/ChangeLog b/ChangeLog
index 4243fd9a06ca2a7780619cb8d3850e835b9da03a..78edaf989519b0a41d75ad95bbb1dd73eed5195d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex
+       to match compressed diffs and tarballs.
+
 2008-01-01  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill'

diff --git a/debian/changelog b/debian/changelog
index d08e289685ad543a9ee6821781fb9df1c5bc474a..df02cec0dbb3b37989f60bb730c5ca6cc504f33b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Do not print 'failed to kill' warning in start-stop-daemon when polling
     the pid. Closes: #157305, #352554
     Thanks to Samuel Thibault.
+  * Properly print build message in dpkg-buildpackage for lzma and bzip2
+    compressed sources. Closes: #458519
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9d07efa3571cc0b23e91211584bf97075ff2a9e5..dfa0041b7cc57ab81b7fc3e69513d2cfd8e2cf17 100755 (executable)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -11,6 +11,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(warning error failure syserr subprocerr usageerr
                            $warnable_error);
 use Dpkg::BuildOptions;
+use Dpkg::Compression;
 
 push (@INC, $dpkglibdir);
 require 'controllib.pl';
@@ -438,9 +439,9 @@ sub fileomitted {
 my $srcmsg;
 if (fileomitted '\.deb') {
     # source only upload
-    if (fileomitted '\.diff\.gz') {
+    if (fileomitted "\.diff\.$comp_regex") {
        $srcmsg = _g('source only upload: Debian-native package');
-    } elsif (fileomitted '\.orig\.tar\.gz') {
+    } elsif (fileomitted "\.orig\.tar\.$comp_regex") {
        $srcmsg = _g('source only, diff-only upload (original source NOT included)');
     } else {
        $srcmsg = _g('source only upload (original source is included)');
@@ -449,9 +450,9 @@ if (fileomitted '\.deb') {
     $srcmsg = _g('full upload (original source is included)');
     if (fileomitted '\.dsc') {
        $srcmsg = _g('binary only upload (no source included)');
-    } elsif (fileomitted '\.diff\.gz') {
+    } elsif (fileomitted "\.diff\.$comp_regex") {
        $srcmsg = _g('full upload; Debian-native package (full source is included)');
-    } elsif (fileomitted '\.orig\.tar\.gz') {
+    } elsif (fileomitted "\.orig\.tar\.$comp_regex") {
        $srcmsg = _g('binary and diff upload (original source NOT included)');
     } else {
        $srcmsg = _g('full upload (original source is included)');