The following commit has been merged in the master branch:
commit dddfbefcb95c0b5e36fe1ad7fea8e4e89650fddf
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Wed Apr 2 08:51:03 2008 +0200
Ensure the Files field is last in *.dsc and *.changes
* scripts/Dpkg/Source/Package.pm, scripts/dpkg-genchanges.pl:
Explicitely put Checksums-* fields before the Files field so that
the Files field is last. This is a work-around for some braindead
dsc parsers (dupload and sbuild for instance, see #473518 and
diff --git a/ChangeLog b/ChangeLog
index 72a8c50..c8ae50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-02 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/Dpkg/Source/Package.pm, scripts/dpkg-genchanges.pl:
+ Explicitely put Checksums-* fields before the Files field so that
+ the Files field is last. This is a work-around for some braindead
+ dsc parsers (dupload and sbuild for instance, see #473518 and
+ #470440).
+
2008-04-01 Raphael Hertzog <[EMAIL PROTECTED]>
* scripts/Dpkg/Source/Package/V2_0.pm: Add the option
diff --git a/debian/changelog b/debian/changelog
index eb777a1..6fc29de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ dpkg (1.14.18) UNRELEASED; urgency=low
* The dpkg-source option --skip-patches disables application of patches
during extraction of source packages using Format: 2.0 or Format: 3.0
(quilt).
+ * Ensure the Files field is last in *.dsc and *.changes. This is a
+ work-around for some braindead dsc parsers (dupload and sbuild for
+ instance, see #473518 and #470440).
[ Updated dselect translations ]
* German. (Sven Joachim).
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index f43bd70..42a792a 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -89,7 +89,7 @@ my @dsc_fields = (qw(Format Source Binary Architecture
Version Origin
Standards-Version Vcs-Browser Vcs-Arch Vcs-Bzr
Vcs-Cvs Vcs-Darcs Vcs-Git Vcs-Hg Vcs-Mtn Vcs-Svn),
@src_dep_fields,
- qw(Files));
+ qw(Checksums-Md5 Checksums-Sha1 Checksums-Sha256 Files));
# Object methods
sub new {
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index b125fd9..c886cd3 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -25,7 +25,8 @@ textdomain("dpkg-dev");
my @changes_fields = qw(Format Date Source Binary Architecture Version
Distribution Urgency Maintainer Changed-By
- Description Closes Changes Files);
+ Description Closes Changes Checksums-Md5
+ Checksums-Sha1 Checksums-Sha256 Files);
my $controlfile = 'debian/control';
my $changelogfile = 'debian/changelog';
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
