The branch, master has been updated via 9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit) from 9ca339d341ab39043d26be6baa028b6b9012c747 (commit)
- Shortlog ------------------------------------------------------------ 9e5cec4 dpkg-buildpackage: Fix build message for non-gz compressed sources Summary of changes: ChangeLog | 5 +++++ debian/changelog | 2 ++ scripts/dpkg-buildpackage.pl | 9 +++++---- 3 files changed, 12 insertions(+), 4 deletions(-) ----------------------------------------------------------------------- Details of changes: commit 9e5cec40fd27da067687c1e36aa30f18b1440cb5 Author: Guillem Jover <[EMAIL PROTECTED]> Date: Tue Jan 1 20:25:39 2008 +0200 dpkg-buildpackage: Fix build message for non-gz compressed sources Closes: #458519 diff --git a/ChangeLog b/ChangeLog index 4243fd9..78edaf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-01 Guillem Jover <[EMAIL PROTECTED]> + + * scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex + to match compressed diffs and tarballs. + 2008-01-01 Samuel Thibault <[EMAIL PROTECTED]> * utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill' diff --git a/debian/changelog b/debian/changelog index d08e289..df02cec 100644 --- 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 9d07efa..dfa0041 100755 --- 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)'); -- dpkg's main repository -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]