dpkg-source: improve compatibility of 3.0 (quilt) with existing patch systems

* scripts/Dpkg/Source/Package/V3/quilt.pm: Remove the .diff
from the name of the automatically generated patch. It will
facilitate the switch to this format: packages using
patch system that apply debian/patches/*.{patch,diff}
will not be bothered by the presence of the quilt series
created by dpkg-source itself.
* man/dpkg-source.1: Update the documentation accordingly.
* man/po/*.po: Fix all the filenames to avoid fuzzying
translations.

diff --git a/ChangeLog b/ChangeLog
index b55ab1eaa879360b2b890e7d10781b9e57b03652..e71a4a465547cf3edc4a85c8cf94efa3d6f6e03e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-23  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Source/Package/V3/quilt.pm: Remove the .diff
+       from the name of the automatically generated patch. It will
+       facilitate the switch to this format: packages using
+       patch system that apply debian/patches/*.{patch,diff}
+       will not be bothered by the presence of the quilt serie
+       created by dpkg-source itself.
+       * man/dpkg-source.1: Update the documentation accordingly.
+       * man/po/*.po: Fix all the filenames to avoid fuzzying
+       translations.
+
 2008-05-22  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Source/Package/V3/quilt.pm: Add missing "use

diff --git a/debian/changelog b/debian/changelog
index e2e3d170ea82d3f79a2dcab133ad3c970309c803..165cbb582920a5e863f58fb6116da90c31edcfc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ dpkg (1.14.20) UNRELEASED; urgency=low
 
   [ Raphael Hertzog ]
   * Add missing 'use File::Path' in Dpkg::Source::Package::V3::quilt.
+  * Use debian/patches/debian-changes-<version> (without the trailing ".diff")
+    as default name for the automatic patch created by the format "3.0
+    (quilt)". This ensures a saner cohabitation with patch systems that
+    apply all of debian/patches/*.{diff,patch}.
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).

diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index cccfc2e333f835a1314eddf402b3e31333dc92d7..f016a5f6eb67da7ca16ac1f6962e252977805b10 100644 (file)
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -371,10 +371,10 @@ patches have been applied during the extraction.
 All original tarballs found in the current directory are extracted in a
 temporary directory by following the same logic as for the unpack, the
 debian directory is copied over in the temporary directory, and all
-patches except \fBdebian-changes-\fP\fIversion\fP\fB.diff\fP are applied.
+patches except \fBdebian-changes-\fP\fIversion\fP are applied.
 The temporary directory is compared to the source package directory
 and the diff (if non-empty) is stored in
-\fBdebian/patches/debian-changes-\fP\fIversion\fP\fB.diff\fP. Any change
+\fBdebian/patches/debian-changes-\fP\fIversion\fP. Any change
 on a binary file is not representable in a diff and will thus lead to a
 failure unless the maintainer deliberately decided to include that
 modified binary file in the debian tarball (by listing it in

diff --git a/man/po/de.po b/man/po/de.po
index 48b086cbdd25b38cdd6ac5c37fce43d233f94fb6..50a38f9d4649d4104dccd5fffe3c075b4c7e4bab 100644 (file)
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -9999,9 +9999,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"
@@ -10012,7 +10012,7 @@ msgstr ""
 "Alle im aktuellen Verzeichnis gefundenen Original-Tarbälle werden in ein "
 "temporäres Verzeichnis entpackt. Hierbei wird die gleiche Logik wie für das "
 "Entpacken verwandt, das debian-Verzeichnis wird in das temporäre Verzeichnis "
-"kopiert und alle Patches außer B<debian-changes->I<Version>B<.diff> werden "
+"kopiert und alle Patches außer B<debian-changes->I<Version> werden "
 "angewandt. Änderungen an Binärdateien können in einem Diff nicht dargestellt "
 "werden und führen daher zu einem Fehlschlag, es sei denn, der Betreuer hat "
 "sich absichtlich dazu entschlossen, die veränderte Binärdatei dem Debian-"

diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 4724b3da780e06329f88ba28eb19b783b60e7736..0f75a32c2ab777f555bc1b4e14de362fd6031a17 100644 (file)
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -7874,10 +7874,10 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if "
 "non-empty) is stored in "
-"B<debian/patches/debian-changes->I<version>B<.diff>. Any change on a binary "
+"B<debian/patches/debian-changes->I<version>. Any change on a binary "
 "file is not representable in a diff and will thus lead to a failure unless "
 "the maintainer deliberately decided to include that modified binary file in "
 "the debian tarball (by listing it in B<debian/source/include-binaries>). The "

diff --git a/man/po/es.po b/man/po/es.po
index 5ad28192c459d2240736d45abe3f57261cfc6af2..5a312f820624a58e0c2dd4dcfaff2de670465aab 100644 (file)
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -9572,9 +9572,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/fr.po b/man/po/fr.po
index fe90edb184efc0642ac15c36bd46b9428eaa79ec..585cb8f3187d41309411e83de2db378863b3de08 100644 (file)
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -9560,9 +9560,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/hu.po b/man/po/hu.po
index 5dfdcb8482742c3fc4701ad3e16de6d9f0274492..8018373bcb15890536bc6e1368d56308b783aaf8 100644 (file)
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -8292,9 +8292,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/ja.po b/man/po/ja.po
index 86518a62e2c9136e1190de0d099493488974a8d9..7578e854c6f25a65ae1ca36fa3fdaa68b3ff81a5 100644 (file)
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -8918,9 +8918,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/pl.po b/man/po/pl.po
index 147fc82723383164cdf4ce553dc5f1e04ac7a014..3265409e5518939033e8adfbe67158e65330223d 100644 (file)
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -10012,9 +10012,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 3cc068e7a6574e6fa0e023bc8ade5ed15f0cfe28..6a02549a79a0dfd8e74bb5e5ba80fa8c0ca3bbf3 100644 (file)
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -8442,9 +8442,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/ru.po b/man/po/ru.po
index d1416327113ce4f4cd37bfb2b5d203b7c3036564..1241b7e19dea4602bfe0e532f7aced579288c5d5 100644 (file)
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -8569,9 +8569,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"

diff --git a/man/po/sv.po b/man/po/sv.po
index 4efece64213285efef52e689107f3622b9b6f745..5129ac4d5c1197a2dadff6a972755249a2c24400 100644 (file)
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -9746,9 +9746,9 @@ msgid ""
 "All original tarballs found in the current directory are extracted in a "
 "temporary directory by following the same logic as for the unpack, the "
 "debian directory is copied over in the temporary directory, and all patches "
-"except B<debian-changes->I<version>B<.diff> are applied.  The temporary "
+"except B<debian-changes->I<version> are applied.  The temporary "
 "directory is compared to the source package directory and the diff (if non-"
-"empty) is stored in B<debian/patches/debian-changes->I<version>B<.diff>. Any "
+"empty) is stored in B<debian/patches/debian-changes->I<version>. Any "
 "change on a binary file is not representable in a diff and will thus lead to "
 "a failure unless the maintainer deliberately decided to include that "
 "modified binary file in the debian tarball (by listing it in B<debian/source/"
@@ -9759,9 +9759,9 @@ msgstr ""
 "Alla original-tarbollar som finns i den aktuella katalogen packas upp i en "
 "temporär katalog med samma logik som i uppackningen, debian-katalogen "
 "kopieras över i den temporära katalogen och alla patchar, förutom B<debian-"
-"changes->I<version>B<.diff> tillämpas. Temporärkatalogen jämförs därefter "
+"changes->I<version> tillämpas. Temporärkatalogen jämförs därefter "
 "mot källkodskatalogen och diffen (om den inte är tom) lagras i B<debian/"
-"patches/debian-changes->I<version>B<.diff>. Eventuella ändringar på "
+"patches/debian-changes->I<version>. Eventuella ändringar på "
 "binärfiler kan inte representeras i diffen och kommer därmed att leda till "
 "ett felmeddelande, såvida inte paketansvariga medvetet väljer att inkludera "
 "den modifierade binärfilen i debian-tarbollen (genom att lista den i "

diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm b/scripts/Dpkg/Source/Package/V3/quilt.pm
index eb62ef2852a979ca28e4cee2448469bda1a1af82..979d2074464730c246ce37189699bb8fb905e4c8 100644 (file)
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -54,7 +54,7 @@ sub parse_cmdline_option {
 
 sub get_autopatch_name {
     my ($self) = @_;
-    return "debian-changes-" . $self->{'fields'}{'Version'} . ".diff";
+    return "debian-changes-" . $self->{'fields'}{'Version'};
 }
 
 sub get_series_file {