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.

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

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).

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

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-"

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 "

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/"

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/"

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/"

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/"

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/"

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/"

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/"

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 "

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 {