The following commit has been merged in the lenny branch:
commit b625f131ea0f8d94b1fdd2f7b5cf41aa89a7afd7
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Fri May 23 10:11:17 2008 +0200
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 b55ab1e..e71a4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-23 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scripts/Dpkg/Source/Package/V3/quilt.pm: Add missing "use
diff --git a/debian/changelog b/debian/changelog
index e2e3d17..165cbb5 100644
--- 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 cccfc2e..f016a5f 100644
--- 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 48b086c..50a38f9 100644
--- 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 4724b3d..0f75a32 100644
--- 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 5ad2819..5a312f8 100644
--- 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 fe90edb..585cb8f 100644
--- 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 5dfdcb8..8018373 100644
--- 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 86518a6..7578e85 100644
--- 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 147fc82..3265409 100644
--- 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 3cc068e..6a02549 100644
--- 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 d141632..1241b7e 100644
--- 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 4efece6..5129ac4 100644
--- 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 eb62ef2..979d207 100644
--- 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 {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
