[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-277-gf341818

2011-08-22 Thread Guillem Jover 
The following commit has been merged in the master branch:
commit f3418186f6b093162d9e6b47e73d01d795c2ef98
Author: Guillem Jover 
Date:   Tue Aug 23 05:24:39 2011 +0200

dpkg-source: Make single-debian-patch not abort on upstream changes

The single-debian-patch option usage in Dpkg::Source::Package::V2
was typoed as single_debian_patch, and thus not avoiding aborting
on upstream changes. Instead of fixing the typo, let's just not
expose single-debian-patch in Dpkg::Source::Package::V2, as it's
Dpkg::Source::Package::V3::quilt specific and as such a layer
violation, the code will just set auto_commit when single-debian-patch
is specified, which is the actual intended behaviour. Reflect this
explicitly in the man page.

Regression introduced in commit 46b688e4824f00842568b517b119eec34a5f7286.

Reported-by: Bernhard R. Link 

diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index e124fe6..d649b0d 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -445,7 +445,7 @@ or \fBdebian\-changes\fP, depending on 
\fB\-\-single\-debian\-patch\fP) are
 applied. The temporary directory is compared to the source package
 directory. When the diff is non-empty, the build fails unless
 \fB\-\-single\-debian\-patch\fP or \fB\-\-auto\-commit\fP
-has been used. In the latter case, the diff is stored in the automatic patch.
+has been used, in which case the diff is stored in the automatic patch.
 If the automatic patch is created/deleted, it's added/removed from the
 series file and from the quilt metadata.
 
diff --git a/scripts/Dpkg/Source/Package/V2.pm 
b/scripts/Dpkg/Source/Package/V2.pm
index 12d448a..53a6699 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -501,8 +501,7 @@ sub do_build {
 my $tmpdiff = $self->generate_patch($dir, order_from => $autopatch,
 handle_binary => $handle_binary,
 usage => 'build');
-unless (-z $tmpdiff or $self->{'options'}{'single_debian_patch'}
-or $self->{'options'}{'auto_commit'}) {
+unless (-z $tmpdiff or $self->{'options'}{'auto_commit'}) {
 info(_g("you can integrate the local changes with %s"),
  "dpkg-source --commit");
 error(_g("aborting due to unexpected upstream changes, see %s"),
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm 
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 2fbcba2..e45016f 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -54,6 +54,8 @@ sub parse_cmdline_option {
 return 1 if $self->SUPER::parse_cmdline_option($opt);
 if ($opt =~ /^--single-debian-patch$/) {
 $self->{'options'}{'single-debian-patch'} = 1;
+# For backwards compatibility.
+$self->{'options'}{'auto_commit'} = 1;
 return 1;
 } elsif ($opt =~ /^--allow-version-of-quilt-db=(.*)$/) {
 push @{$self->{'options'}{'allow-version-of-quilt-db'}}, $1;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-277-gf341818

2011-08-22 Thread Guillem Jover 
The following commit has been merged in the master branch:
commit d97161c298625c8475b0b3d2d9e89e60ae56a5ff
Author: Guillem Jover 
Date:   Tue Aug 23 03:55:27 2011 +0200

Dpkg::Source::Package: Use “-z” instead of “not -s”

diff --git a/scripts/Dpkg/Source/Package/V2.pm 
b/scripts/Dpkg/Source/Package/V2.pm
index 4912dfd..12d448a 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -501,7 +501,7 @@ sub do_build {
 my $tmpdiff = $self->generate_patch($dir, order_from => $autopatch,
 handle_binary => $handle_binary,
 usage => 'build');
-unless (not -s $tmpdiff or $self->{'options'}{'single_debian_patch'}
+unless (-z $tmpdiff or $self->{'options'}{'single_debian_patch'}
 or $self->{'options'}{'auto_commit'}) {
 info(_g("you can integrate the local changes with %s"),
  "dpkg-source --commit");
diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm 
b/scripts/Dpkg/Source/Package/V3/quilt.pm
index 4db776b..2fbcba2 100644
--- a/scripts/Dpkg/Source/Package/V3/quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/quilt.pm
@@ -389,7 +389,7 @@ sub register_patch {
 erasedir(File::Spec->catdir($dir, ".pc", $patch_name));
 }
 # Clean up empty series
-unlink($series) if not -s $series;
+unlink($series) if -z $series;
 }
 return $patch;
 }

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-275-ga596ab8

2011-08-22 Thread Helge Kreutzmann 
The following commit has been merged in the master branch:
commit a596ab8ef36ade2743dbd442d660b36146574624
Author: Helge Kreutzmann 
Date:   Mon Aug 22 20:57:14 2011 +0200

Update German scripts translation

Update to 523t.

diff --git a/scripts/po/de.po b/scripts/po/de.po
index 8a5c35f..f3fe4b5 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n"
-"POT-Creation-Date: 2011-08-01 22:21+0200\n"
-"PO-Revision-Date: 2011-08-02 19:30+0200\n"
+"POT-Creation-Date: 2011-08-22 17:36+\n"
+"PO-Revision-Date: 2011-08-22 20:35+0200\n"
 "Last-Translator: Helge Kreutzmann \n"
 "Language-Team: de \n"
 "Language: de\n"
@@ -925,7 +925,7 @@ msgstr "neue Ausgabe-Steuerdatei »%s« kann nicht geöffnet 
werden"
 #: scripts/dpkg-gencontrol.pl:378 scripts/dpkg-shlibdeps.pl:523
 #: scripts/Dpkg/Interface/Storable.pm:91
 #: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
-#: scripts/Dpkg/Source/Package/V2.pm:602
+#: scripts/Dpkg/Source/Package/V2.pm:603
 #, perl-format
 msgid "cannot close %s"
 msgstr "%s kann nicht geschlossen werden"
@@ -1102,8 +1102,8 @@ msgstr ""
 #: scripts/Dpkg/Interface/Storable.pm:115 scripts/Dpkg/IPC.pm:255
 #: scripts/Dpkg/IPC.pm:263 scripts/Dpkg/Source/Functions.pm:78
 #: scripts/Dpkg/Source/Package.pm:447 scripts/Dpkg/Source/Package.pm:550
-#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:525
-#: scripts/Dpkg/Source/Package/V2.pm:600
+#: scripts/Dpkg/Source/Package/V2.pm:217 scripts/Dpkg/Source/Package/V2.pm:526
+#: scripts/Dpkg/Source/Package/V2.pm:601
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:140
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:149
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:155
@@ -1300,9 +1300,8 @@ msgstr ""
 "--all alle Änderungen hinzufügen\n"
 
 #: scripts/dpkg-parsechangelog.pl:117
-#, perl-format
-msgid "%s takes no non-option arguments"
-msgstr "%s akzeptiert kein nicht-Options-Argument"
+msgid "takes no non-option arguments"
+msgstr "akzeptiert kein nicht-Options-Argument"
 
 #: scripts/dpkg-scanpackages.pl:66
 #, perl-format
@@ -1354,9 +1353,9 @@ msgstr "  %s (laut Paket %s, nicht %s)"
 msgid "Unconditional maintainer override for %s"
 msgstr "Bedingungslose Übersteuerung (»override«) des Betreuers für %s"
 
-#: scripts/dpkg-scanpackages.pl:158
-msgid "1 to 3 args expected"
-msgstr "1 bis 3 Argumente erwartet"
+#: scripts/dpkg-scanpackages.pl:158 scripts/dpkg-scansources.pl:302
+msgid "one to three arguments expected"
+msgstr "ein bis drei Argumente erwartet"
 
 #: scripts/dpkg-scanpackages.pl:175
 #, perl-format
@@ -1515,10 +1514,6 @@ msgstr "doppelte Quell-Override-Einträge für %s in Zeile 
%d werden ignoriert"
 msgid "no binary packages specified in %s"
 msgstr "keine Binärpakete in %s angegeben"
 
-#: scripts/dpkg-scansources.pl:302
-msgid "1 to 3 args expected\n"
-msgstr "1 bis 3 Argumente erwartet\n"
-
 #: scripts/dpkg-shlibdeps.pl:93
 #, perl-format
 msgid "administrative directory '%s' does not exist"
@@ -1801,12 +1796,12 @@ msgstr "Wechsel in Verzeichnis »%s« nicht möglich"
 msgid "using options from %s: %s"
 msgstr "Optionen aus %s werden verwendet: %s"
 
-#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:168
+#: scripts/dpkg-source.pl:150 scripts/Dpkg/Compression.pm:173
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s ist keine unterstützte Kompression"
 
-#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:193
+#: scripts/dpkg-source.pl:156 scripts/Dpkg/Compression.pm:202
 #: scripts/Dpkg/Compression/Process.pm:86
 #, perl-format
 msgid "%s is not a compression level"
@@ -1845,7 +1840,7 @@ msgstr "%s listet kein binäres Paket auf"
 #: scripts/Dpkg/Compression/FileHandle.pm:401
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
 #: scripts/Dpkg/Source/Package/V2.pm:277 scripts/Dpkg/Source/Package/V2.pm:423
-#: scripts/Dpkg/Source/Package/V2.pm:556
+#: scripts/Dpkg/Source/Package/V2.pm:557
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:110
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:284
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:346
@@ -1869,9 +1864,9 @@ msgid "using source format `%s'"
 msgstr "Quellformat »%s« wird verwendet"
 
 #: scripts/dpkg-source.pl:388 scripts/Dpkg/Source/Package/V1.pm:301
-#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:536
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:537
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
-#: scripts/Dpkg/Source/Package/V3/native.pm:83
+#: scripts/Dpkg/Source/Package/V3/native.pm:84
 #, perl-format
 msgid "building %s in %s"
 msgstr "%s wird in %s gebaut"
@@ -2946,7 +2941,7 @@ msgid "source handling style -s%s not allowed with -x"
 msgstr "Quellbearbeitungsstil -s%s mit -x nicht erlaubt"
 
 #: scripts/Dpkg/Source/Package/V1.pm:96
-#: scripts/Dpkg/Source/Package/V3/native.pm:50
+#: scr

[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-274-g513ad32

2011-08-22 Thread Helge Kreutzmann 
The following commit has been merged in the master branch:
commit 513ad320a9677766f50aa2741d23987bce5b92a5
Author: Helge Kreutzmann 
Date:   Mon Aug 22 20:33:18 2011 +0200

Update German translation of manual pages

Update to 2038t.

diff --git a/man/po/de.po b/man/po/de.po
index 8c6dea0..c791c90 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg man pages\n"
-"POT-Creation-Date: 2011-08-02 16:42+\n"
-"PO-Revision-Date: 2011-08-03 21:19+0200\n"
+"POT-Creation-Date: 2011-08-22 17:36+\n"
+"PO-Revision-Date: 2011-08-22 20:25+0200\n"
 "Last-Translator: Helge Kreutzmann \n"
 "Language-Team: de \n"
 "Language: \n"
@@ -23,10 +23,17 @@ msgid "deb"
 msgstr "deb"
 
 #. type: TH
-#: deb.5:1
+#: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-version.5:5 deb-old.5:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg.1:1
+#: dpkg-architecture.1:1 dpkg-buildflags.1:1 dpkg-buildpackage.1:1
+#: dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1
+#: dpkg-gensymbols.1:2 dpkg-maintscript-helper.1:1 dpkg-mergechangelogs.1:1
+#: dpkg-name.1:6 dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
+#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-source.1:2 dpkg-trigger.1:1
+#: dselect.1:1 update-alternatives.8:8
 #, no-wrap
-msgid "2009-02-27"
-msgstr "2009-02-27"
+msgid "2011-08-14"
+msgstr "2011-08-14"
 
 #. type: TH
 #: deb.5:1 deb-control.5:3 deb-src-control.5:3 deb-split.5:1 deb-version.5:5
@@ -281,19 +288,6 @@ msgstr "B(5), B(1), B(5)."
 msgid "deb-control"
 msgstr "deb-control"
 
-#. type: TH
-#: deb-control.5:3 deb-split.5:1 deb-version.5:5 dpkg-architecture.1:1
-#: dpkg-buildpackage.1:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1
-#: dpkg-deb.1:1 dpkg-divert.8:1 dpkg-genchanges.1:1 dpkg-gencontrol.1:1
-#: dpkg-gensymbols.1:2 dpkg-maintscript-helper.1:1 dpkg-name.1:6
-#: dpkg-parsechangelog.1:1 dpkg-query.1:1 dpkg-scanpackages.1:15
-#: dpkg-scansources.1:1 dpkg-shlibdeps.1:1 dpkg-split.1:2
-#: dpkg-statoverride.8:1 dpkg-vendor.1:1 dselect.1:1 start-stop-daemon.8:1
-#: update-alternatives.8:8
-#, no-wrap
-msgid "2011-07-04"
-msgstr "2011-07-04"
-
 #. type: Plain text
 #: deb-control.5:6
 msgid "deb-control - Debian packages' master control file format"
@@ -944,12 +938,6 @@ msgstr ""
 msgid "deb-src-control"
 msgstr "deb-src-control"
 
-#. type: TH
-#: deb-src-control.5:3
-#, no-wrap
-msgid "2011-04-29"
-msgstr "2011-04-29"
-
 #. type: Plain text
 #: deb-src-control.5:6
 msgid "deb-src-control - Debian source packages' master control file format"
@@ -1457,7 +1445,7 @@ msgid ""
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E= 4.1.81),\n"
-" libselinux1-dev (E= 1.28-4) [!hurd-i386 !kfreebsd-i386 
!kfreebsd-amd64]\n"
+" libselinux1-dev (E= 1.28-4) [!linux-any]\n"
 msgstr ""
 "# Kommentar\n"
 "Source: dpkg\n"
@@ -1471,7 +1459,7 @@ msgstr ""
 "Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E= 4.1.81),\n"
-" libselinux1-dev (E= 1.28-4) [!hurd-i386 !kfreebsd-i386 
!kfreebsd-amd64]\n"
+" libselinux1-dev (E= 1.28-4) [!linux-any]\n"
 
 #. type: Plain text
 #: deb-src-control.5:323
@@ -1483,8 +1471,8 @@ msgid ""
 "Architecture: all\n"
 "# this is a custom field in the binary package\n"
 "XB-Mentoring-Contact: Raphael Hertzog Ehert...@debian.orge\n"
-"Depends: dpkg (E= 1.14.6), perl5, perl-modules, cpio (E= 2.4.2-2), 
bzip2, lzma,\n"
-" patch (E= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E= 1.14.6), perl5, perl-modules, cpio (E= 2.4.2-2),\n"
+" bzip2, lzma, patch (E= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (EE 2.0.0), devscripts (EE 2.10.26)\n"
@@ -1502,8 +1490,8 @@ msgstr ""
 "Architecture: all\n"
 "# dies ist ein spezielles Feld im Binärpaket\n"
 "XB-Mentoring-Contact: Raphael Hertzog Ehert...@debian.orge\n"
-"Depends: dpkg (E= 1.14.6), perl5, perl-modules, cpio (E= 2.4.2-2), 
bzip2, lzma,\n"
-" patch (E= 2.2-1), make, binutils, libtimedate-perl\n"
+"Depends: dpkg (E= 1.14.6), perl5, perl-modules, cpio (E= 2.4.2-2),\n"
+" bzip2, lzma, patch (E= 2.2-1), make, binutils, libtimedate-perl\n"
 "Recommends: gcc | c-compiler, build-essential\n"
 "Suggests: gnupg, debian-keyring\n"
 "Conflicts: dpkg-cross (EE 2.0.0), devscripts (EE 2.10.26)\n"
@@ -1526,6 +1514,13 @@ msgstr "B(5), B(5), 
B(1)"
 msgid "deb-split"
 msgstr "deb-split"
 
+#. type: TH
+#: deb-split.5:1 dpkg-checkbuilddeps.1:1 dpkg-distaddfile.1:1 dpkg-split.1:2
+#: dpkg-statoverride.8:1 dpkg-vendor.1:1 start-stop-daemon.8:1
+#, no-wrap
+msgid "2011-07-04"
+msgstr "2011-07-04"
+
 #. type: Plain text
 #: deb-split.5:4
 msgid "deb-split - Debian multi-part binary package format"
@@ -1974,12 +1969,6 @@ msgstr ""
 msgid "deb-old"
 msgstr "deb-old"
 
-#. type: TH
-#: deb-old.5:1
-#, no-wrap
-m