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 72a8c509eb304845dfa2bc67d5de011debbd9eba..c8ae50bc7eb09b320614244af258b4626f249b56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-02  Raphael Hertzog  <hertzog@debian.org>
+
+       * 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  <hertzog@debian.org>
 
        * scripts/Dpkg/Source/Package/V2_0.pm: Add the option

diff --git a/debian/changelog b/debian/changelog
index eb777a18b3d226de967cf70bc64c0773f4648962..6fc29deb575c7189e52ff7aaa9b4fe2a7b068288 100644 (file)
--- 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 f43bd7098279401f3a3f2c715540ea8ce7101af3..42a792af7d29e3dcc15a5ea8d08fb8f54c1c1567 100644 (file)
--- 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 b125fd994b1f223f62f600829a6f82bf228b0b4c..c886cd3d0ccf9754394fe4e7e31be3dd9fedf9dc 100755 (executable)
--- 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';