The following commit has been merged in the lenny branch:
commit de193419c89d9507da29c179b678c7ff2b52eed5
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Sat Jun 21 19:05:27 2008 +0200
dpkg-buildpackage/dpkg-genchanges: handle .debian.tar.gz files too
* scripts/dpkg-buildpackage.pl, scripts/dpkg-genchanges.pl: Treat
debian.tar.gz files (used by 3.0 (quilt) source packages) like diff.gz
files when it comes to detection of the kind of upload.
diff --git a/ChangeLog b/ChangeLog
index 29bf8f7..5d3ddd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-06-21 Raphael Hertzog <[EMAIL PROTECTED]>
+ * scripts/dpkg-buildpackage.pl, scripts/dpkg-genchanges.pl: Treat
+ debian.tar.gz files (used by 3.0 (quilt) source packages) like
+ diff.gz files when it comes to detection of the kind of upload.
+
+2008-06-21 Raphael Hertzog <[EMAIL PROTECTED]>
+
* scripts/Dpkg/Source/Package/V3/quilt.pm: Define QUILT_SERIES
when running quilt in order to be able to use quilt series with
non-standard names (like debian.series or ubuntu.series).
diff --git a/debian/changelog b/debian/changelog
index f158736..a20519a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dpkg (1.14.21) UNRELEASED; urgency=low
[ Raphael Hertzog ]
* Small fix in "3.0 (quilt)" source format when using non-standard name
of the quilt series.
+ * Handle debian.tar.gz files like diff.gz in dpkg-buildpackage and
+ dpkg-genchanges to detect the kind of upload.
-- Raphael Hertzog <[EMAIL PROTECTED]> Wed, 18 Jun 2008 10:19:51 +0200
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1b33140..a052228 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -414,10 +414,10 @@ close CHANGES or subprocerr(_g('dpkg-genchanges'));
close OUT or syserr(_g('write changes file'));
my $srcmsg;
-sub fileomitted { return $files !~ /$_[0]/ }
+sub fileomitted($) { return $files !~ /$_[0]/ }
if (fileomitted '\.deb') {
# source only upload
- if (fileomitted "\.diff\.$comp_regex") {
+ if (fileomitted "\.diff\.$comp_regex" and fileomitted
"\.debian\.tar\.$comp_regex") {
$srcmsg = _g('source only upload: Debian-native package');
} elsif (fileomitted "\.orig\.tar\.$comp_regex") {
$srcmsg = _g('source only, diff-only upload (original source NOT
included)');
@@ -428,7 +428,7 @@ 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\.$comp_regex") {
+ } elsif (fileomitted "\.diff\.$comp_regex" and fileomitted
"\.debian\.tar\.$comp_regex") {
$srcmsg = _g('full upload; Debian-native package (full source is
included)');
} elsif (fileomitted "\.orig\.tar\.$comp_regex") {
$srcmsg = _g('binary and diff upload (original source NOT included)');
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index a59918f..aac6da7 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -453,12 +453,12 @@ if (!is_binaryonly) {
if ((($sourcestyle =~ m/i/ && not($include_tarball)) ||
$sourcestyle =~ m/d/) &&
- grep(m/\.diff\.$comp_regex$/,@sourcefiles)) {
+ grep(m/\.(debian\.tar|diff)\.$comp_regex$/,@sourcefiles)) {
$origsrcmsg= _g("not including original source code in upload");
@sourcefiles= grep(!m/\.orig\.tar\.$comp_regex$/,@sourcefiles);
} else {
if ($sourcestyle =~ m/d/ &&
- !grep(m/\.diff\.$comp_regex$/,@sourcefiles)) {
+ !grep(m/\.(debian\.tar|diff)\.$comp_regex$/,@sourcefiles)) {
warning(_g("ignoring -sd option for native Debian package"));
}
$origsrcmsg= _g("including full source code in upload");
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
