From b625f131ea0f8d94b1fdd2f7b5cf41aa89a7afd7 Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Fri, 23 May 2008 10:11:17 +0200 Subject: [PATCH] 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 | 12 ++++++++++++ debian/changelog | 4 ++++ man/dpkg-source.1 | 4 ++-- man/po/de.po | 6 +++--- man/po/dpkg-man.pot | 4 ++-- man/po/es.po | 4 ++-- man/po/fr.po | 4 ++-- man/po/hu.po | 4 ++-- man/po/ja.po | 4 ++-- man/po/pl.po | 4 ++-- man/po/pt_BR.po | 4 ++-- man/po/ru.po | 4 ++-- man/po/sv.po | 8 ++++---- scripts/Dpkg/Source/Package/V3/quilt.pm | 2 +- 14 files changed, 42 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index b55ab1ea..e71a4a46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-05-23 Raphael Hertzog + + * 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 * scripts/Dpkg/Source/Package/V3/quilt.pm: Add missing "use diff --git a/debian/changelog b/debian/changelog index e2e3d170..165cbb58 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- (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 cccfc2e3..f016a5f6 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 48b086cb..50a38f9d 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> werden " +"kopiert und alle Patches außer BI 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 4724b3da..0f75a32c 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if " "non-empty) is stored in " -"BIB<.diff>. Any change on a binary " +"BI. 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). The " diff --git a/man/po/es.po b/man/po/es.po index 5ad28192..5a312f82 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> are applied. The temporary " +"except BI are applied. The temporary " "directory is compared to the source package directory and the diff (if non-" -"empty) is stored in BIB<.diff>. Any " +"empty) is stored in BI. 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 BIB<.diff> tillämpas. Temporärkatalogen jämförs därefter " +"changes->I tillämpas. Temporärkatalogen jämförs därefter " "mot källkodskatalogen och diffen (om den inte är tom) lagras i BIB<.diff>. Eventuella ändringar pÃ¥ " +"patches/debian-changes->I. 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 eb62ef28..979d2074 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 { -- 2.39.5