Просмотр исходного кода

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
Raphael Hertzog лет назад: 18
Родитель
Сommit
dddfbefcb9
4 измененных файлов с 14 добавлено и 2 удалено
  1. 8 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      scripts/Dpkg/Source/Package.pm
  4. 2 1
      scripts/dpkg-genchanges.pl

+ 8 - 0
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

+ 3 - 0
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).

+ 1 - 1
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 {

+ 2 - 1
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';