Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

4 files changed, 363 insertions, 372 deletions

diff --git a/debian/changelog b/debian/changelog
index 8adcaab68..06e0dee94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
   * Fix description of Multi-Arch in deb-control(5). Closes: #654453
     Thanks to Jakub Wilk for spotting the mistake.
   * Drop misleading spaces in deb-symbols(5) in the format description.
+  * Clean up dpkg-architecture(1) dropping useless information and
+    adding a reference to /usr/share/dpkg/architecture.mk.
 
   [ Jonathan Nieder ]
   * Bump po4a version in Build-Depends to 0.41, since earlier versions do
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index bf2707903..d86a5c228 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -1,4 +1,4 @@
-.TH dpkg\-architecture 1 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH dpkg\-architecture 1 "2012-01-20" "Debian Project" "dpkg utilities"
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 .
@@ -147,114 +147,53 @@ which also show how you can improve the cross compilation support in your
 package:
 .PP
 
-Instead of:
-.IP
-.nf
-ARCH=\`dpkg \-\-print\-architecture\`
-configure $(\s-1ARCH\s0)\-linux
-.fi
-.PP
-please use the following:
+Retrieving the GNU system type and forwarding it to ./configure:
 .IP
 .nf
 \&\s-1DEB_BUILD_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
 \&\s-1DEB_HOST_GNU_TYPE\s0 := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
-
+[...]
 configure \-\-build=$(\s-1DEB_BUILD_GNU_TYPE\s0) \-\-host=$(\s-1DEB_HOST_GNU_TYPE\s0)
 .fi
 .PP
 
-Instead of:
-.IP
-.nf
-ARCH=\`dpkg \-\-print\-architecture\`
-ifeq ($(\s-1ARCH\s0),alpha)
-  ...
-endif
-.fi
-.PP
-please use:
+Doing something only for a specific architecture:
 .IP
 .nf
 \&\s-1DEB_HOST_ARCH\s0 := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
 
 ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
-  ...
+  [...]
 endif
 .fi
 .PP
 or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU
 or DEB_HOST_ARCH_OS variables.
 .PP
-In general, calling dpkg in the rules file to get architecture information
-is deprecated (unless you want to provide backward compatibility, see below).
-Especially the \-\-print\-architecture option is unreliable since we have
-Debian architectures which don't equal a processor name.
-.
-.SH "BACKWARD COMPATIBILITY"
-The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced
-in dpkg\-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
-build-dependency on dpkg\-dev (>= 1.15.4).
-.PP
-The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced
-in dpkg\-dev 1.13.2. Before this \fIdebian/rules\fR files tended to check
-the values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which
-have been subject to change.
-.PP
-Where \fIdebian/rules\fR files check these variables to decide how or what
-to compile, this should be updated to use the new variables and values.
-You may wish to retain backwards compatibility with older version of
-dpkg\-dev by using the following code:
+Note that you can also rely on an external Makefile snippet to properly
+set all the variables that \fBdpkg\-architecture\fP can provide:
 .IP
 .nf
-DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
+include /usr/share/dpkg/architecture.mk
 
-# Take account of old dpkg\-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
-  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
-    DEB_HOST_ARCH_CPU := amd64
-  endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
-  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
-  ifeq ($(DEB_HOST_ARCH_OS),gnu)
-    DEB_HOST_ARCH_OS := hurd
-  endif
+ifeq ($(\s-1DEB_HOST_ARCH\s0),alpha)
+  [...]
 endif
 .fi
 .PP
-And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS.
-.PP
-If you still wish to support versions of dpkg\-dev that did not include
-\fBdpkg\-architecture\fR, the following does the job:
-.IP
-.nf
-\&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
-\&\s-1DEB_BUILD_GNU_CPU\s0 := $(patsubst hurd\-%,%,$(\s-1DEB_BUILD_ARCH\s0))
-ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
-  \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
-else
-  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
-endif
-DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
-
-\&\s-1DEB_HOST_ARCH\s0 := $(\s-1DEB_BUILD_ARCH\s0)
-\&\s-1DEB_HOST_GNU_CPU\s0 := $(\s-1DEB_BUILD_GNU_CPU\s0)
-\&\s-1DEB_HOST_GNU_SYSTEM\s0 := $(\s-1DEB_BUILD_GNU_SYSTEM\s0)
-\&\s-1DEB_HOST_GNU_TYPE\s0 := $(\s-1DEB_BUILD_GNU_TYPE\s0)
-.fi
+In any case, you should never use \fBdpkg \-\-print\-architecture\fP to get
+architecture information during a package build.
+.
+.SH "BACKWARD COMPATIBILITY"
+The /usr/share/dpkg/architecture.mk Makefile snippet is provided by
+dpkg\-dev since version 1.16.1.
 .PP
-Put a subset of these lines at the top of your debian/rules file; these
-default values will be overwritten if dpkg\-architecture is used.
+The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced
+in dpkg\-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
+build-dependency on dpkg\-dev (>= 1.15.4).
 .PP
-You don't need the full set. Choose a consistent set which contains the
-values you use in the rules file. For example, if you only need the host
-Debian architecture, `DEB_HOST_ARCH=\`dpkg \-\-print\-architecture\`'
-is sufficient (this is indeed the Debian architecture of the build machine,
-but remember that we are only trying to be backward compatible with native
-compilation).
+The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced
+in dpkg\-dev 1.13.2.
 .PP
 The \fB\-e\fP and \fB\-i\fP options were only introduced in relatively recent
 versions of \fBdpkg\-architecture\fR (since dpkg 1.13.13).
diff --git a/man/po/de.po b/man/po/de.po
index d5a60b0d2..164fa9fc1 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: 2012-01-15 13:28+0100\n"
-"PO-Revision-Date: 2012-01-15 17:01+0100\n"
+"POT-Creation-Date: 2012-01-20 19:22+0100\n"
+"PO-Revision-Date: 2012-01-20 20:48+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
@@ -24,11 +24,10 @@ msgstr "deb"
 
 #. type: TH
 #: 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-architecture.1:1
-#: dpkg-buildpackage.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-scanpackages.1:15 dpkg-scansources.1:1 dpkg-shlibdeps.1:1
+#: deb-override.5:15 deb-symbols.5:2 deb-triggers.5:1 dpkg-buildpackage.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-scanpackages.1:15 dpkg-scansources.1:1
 #: dpkg-source.1:2 dpkg-trigger.1:1 dselect.1:1 update-alternatives.8:8
 #, no-wrap
 msgid "2011-08-14"
@@ -266,10 +265,10 @@ msgstr ""
 #: deb.5:79 deb-control.5:270 deb-src-control.5:327 deb-split.5:49
 #: deb-version.5:116 deb-old.5:51 deb-origin.5:38 deb-override.5:62
 #: deb-extra-override.5:37 deb-shlibs.5:61 deb-substvars.5:154
-#: deb-symbols.5:61 deb-triggers.5:67 dpkg.1:785 dpkg-architecture.1:299
+#: deb-symbols.5:61 deb-triggers.5:67 dpkg.1:785 dpkg-architecture.1:238
 #: dpkg.cfg.5:23 dpkg-buildpackage.1:249 dpkg-deb.1:267 dpkg-divert.8:132
 #: dpkg-gensymbols.1:451 dpkg-name.1:96 dpkg-query.1:231
-#: dpkg-scanpackages.1:110 dpkg-scansources.1:71 dpkg-shlibdeps.1:324
+#: dpkg-scanpackages.1:110 dpkg-scansources.1:71 dpkg-shlibdeps.1:327
 #: dpkg-source.1:729 dpkg-split.1:217 dpkg-statoverride.8:84 dpkg-trigger.1:66
 #: dpkg-vendor.1:48 dselect.1:445 dselect.cfg.5:23 update-alternatives.8:508
 #, no-wrap
@@ -1929,7 +1928,7 @@ msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 #: deb-version.5:120 dpkg.1:800 dpkg-buildpackage.1:257 dpkg-distaddfile.1:47
 #: dpkg-genchanges.1:148 dpkg-gencontrol.1:142 dpkg-gensymbols.1:461
 #: dpkg-maintscript-helper.1:128 dpkg-parsechangelog.1:123
-#: dpkg-shlibdeps.1:329 dpkg-source.1:734 dselect.1:451
+#: dpkg-shlibdeps.1:332 dpkg-source.1:734 dselect.1:451
 #: start-stop-daemon.8:331 update-alternatives.8:494
 #, no-wrap
 msgid "AUTHORS"
@@ -1952,7 +1951,7 @@ msgstr "Copyright \\(co 2007 Frank Lichtenheld"
 #: dpkg-deb.1:277 dpkg-divert.8:139 dpkg-genchanges.1:154
 #: dpkg-gencontrol.1:150 dpkg-gensymbols.1:465 dpkg-maintscript-helper.1:139
 #: dpkg-mergechangelogs.1:71 dpkg-name.1:108 dpkg-parsechangelog.1:131
-#: dpkg-query.1:230 dpkg-shlibdeps.1:339 dpkg-source.1:742 dpkg-split.1:227
+#: dpkg-query.1:230 dpkg-shlibdeps.1:342 dpkg-source.1:742 dpkg-split.1:227
 #: dpkg-statoverride.8:91 dpkg-vendor.1:55 update-alternatives.8:501
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or later "
@@ -2408,7 +2407,7 @@ msgstr ""
 "Details."
 
 #. type: SH
-#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:731 dpkg-architecture.1:262
+#: deb-shlibs.5:41 deb-symbols.5:43 dpkg.1:731 dpkg-architecture.1:201
 #: dpkg-divert.8:91 dpkg-name.1:65 update-alternatives.8:459
 #, no-wrap
 msgid "EXAMPLES"
@@ -2799,7 +2798,7 @@ msgstr ""
 "wird es eine Warnung erstellen und ein leerer Wert wird angenommen."
 
 #. type: SH
-#: deb-substvars.5:145 dpkg.1:644 dpkg-architecture.1:284 dpkg.cfg.5:12
+#: deb-substvars.5:145 dpkg.1:644 dpkg-architecture.1:223 dpkg.cfg.5:12
 #: dpkg-buildflags.1:137 dpkg-distaddfile.1:39 dpkg-divert.8:122
 #: dpkg-genchanges.1:138 dpkg-gencontrol.1:128 dpkg-parsechangelog.1:115
 #: dpkg-split.1:206 dpkg-statoverride.8:74 dselect.cfg.5:12
@@ -2846,7 +2845,7 @@ msgstr ""
 "(1), B<dpkg-source>(1)."
 
 #. type: SH
-#: deb-substvars.5:161 dpkg-architecture.1:303 dpkg.cfg.5:19
+#: deb-substvars.5:161 dpkg-architecture.1:242 dpkg.cfg.5:19
 #: dpkg-buildflags.1:283 dpkg-checkbuilddeps.1:45 dpkg-deb.1:273
 #: dpkg-divert.8:135 dpkg-mergechangelogs.1:66 dpkg-name.1:104
 #: dpkg-query.1:225 dpkg-scansources.1:76 dpkg-split.1:223
@@ -2858,7 +2857,7 @@ msgstr "AUTOR"
 #. type: Plain text
 #: deb-substvars.5:163 dpkg-buildpackage.1:259 dpkg-distaddfile.1:49
 #: dpkg-deb.1:275 dpkg-genchanges.1:150 dpkg-gencontrol.1:144
-#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:331 dpkg-source.1:736
+#: dpkg-parsechangelog.1:125 dpkg-shlibdeps.1:334 dpkg-source.1:736
 #: dpkg-split.1:225
 msgid "Copyright \\(co 1995-1996 Ian Jackson"
 msgstr "Copyright \\(co 1995-1996 Ian Jackson"
@@ -2866,7 +2865,7 @@ msgstr "Copyright \\(co 1995-1996 Ian Jackson"
 #. type: Plain text
 #: deb-substvars.5:165 dpkg-buildpackage.1:261 dpkg-distaddfile.1:51
 #: dpkg-genchanges.1:152 dpkg-gencontrol.1:146 dpkg-parsechangelog.1:127
-#: dpkg-shlibdeps.1:333 dpkg-source.1:738 dpkg-statoverride.8:89
+#: dpkg-shlibdeps.1:336 dpkg-source.1:738 dpkg-statoverride.8:89
 msgid "Copyright \\(co 2000 Wichert Akkerman"
 msgstr "Copyright \\(co 2000 Wichert Akkerman"
 
@@ -5456,6 +5455,12 @@ msgstr ""
 msgid "dpkg-architecture"
 msgstr "dpkg-architecture"
 
+#. type: TH
+#: dpkg-architecture.1:1 dpkg-shlibdeps.1:1
+#, no-wrap
+msgid "2012-01-20"
+msgstr "2012-01-20"
+
 #. type: Plain text
 #: dpkg-architecture.1:4
 msgid ""
@@ -6020,80 +6025,49 @@ msgstr ""
 "Cross-Kompilierungs-Unterstützung in Ihrem Paket verbessern können:"
 
 #. type: Plain text
-#: dpkg-architecture.1:151 dpkg-architecture.1:168
-msgid "Instead of:"
-msgstr "Anstatt von:"
+#: dpkg-architecture.1:151
+msgid "Retrieving the GNU system type and forwarding it to ./configure:"
+msgstr "Ermitteln des GNU-Systemtyps und dessen Weiterleitung an ./configure:"
 
 #. type: Plain text
-#: dpkg-architecture.1:155
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
-msgstr ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"configure $(\\s-1ARCH\\s0)-linux\n"
-
-#. type: Plain text
-#: dpkg-architecture.1:158
-msgid "please use the following:"
-msgstr "verwenden Sie bitte das folgende:"
-
-#. type: Plain text
-#: dpkg-architecture.1:162
+#: dpkg-architecture.1:157
 #, no-wrap
 msgid ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"[...]\n"
+"configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 msgstr ""
 "\\&\\s-1DEB_BUILD_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)\n"
 "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)\n"
+"[...]\n"
+"configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:164
-#, no-wrap
-msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-
-#. type: Plain text
-#: dpkg-architecture.1:174
-#, no-wrap
-msgid ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
-msgstr ""
-"ARCH=\\`dpkg --print-architecture\\`\n"
-"ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-"  ...\n"
-"endif\n"
-
-#. type: Plain text
-#: dpkg-architecture.1:177
-msgid "please use:"
-msgstr "bitte verwenden Sie:"
+#: dpkg-architecture.1:161
+msgid "Doing something only for a specific architecture:"
+msgstr "Etwas nur für eine bestimmte Architektur erledigen:"
 
 #. type: Plain text
-#: dpkg-architecture.1:180
+#: dpkg-architecture.1:164
 #, no-wrap
 msgid "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr "\\&\\s-1DEB_HOST_ARCH\\s0 := $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:184
+#: dpkg-architecture.1:168 dpkg-architecture.1:182
 #, no-wrap
 msgid ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
+"  [...]\n"
 "endif\n"
 msgstr ""
 "ifeq ($(\\s-1DEB_HOST_ARCH\\s0),alpha)\n"
-"  ...\n"
+"  [...]\n"
 "endif\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:188
+#: dpkg-architecture.1:172
 msgid ""
 "or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU "
 "or DEB_HOST_ARCH_OS variables."
@@ -6102,184 +6076,67 @@ msgstr ""
 "die DEB_HOST_ARCH_CPU- oder DEB_HOST_ARCH_OS-Variablen."
 
 #. type: Plain text
-#: dpkg-architecture.1:193
-msgid ""
-"In general, calling dpkg in the rules file to get architecture information "
-"is deprecated (unless you want to provide backward compatibility, see "
-"below).  Especially the --print-architecture option is unreliable since we "
-"have Debian architectures which don't equal a processor name."
-msgstr ""
-"Im Allgemeinen wird der Aufruf von Dpkg in der »rules«-Datei, um Architektur-"
-"Informationen zu erhalten, abgelehnt (falls Sie Rückwärtskompatibilität "
-"bereitstellen wollen, siehe unten). Insbesondere die --print-architecture-"
-"Option ist unzuverlässig, da wir Debian-Architekturen haben, die nicht mit "
-"einem Prozessornamen übereinstimmen."
-
-#. type: SH
-#: dpkg-architecture.1:194
-#, no-wrap
-msgid "BACKWARD COMPATIBILITY"
-msgstr "RÜCKWÄRTSKOMPATIBILITÄT"
-
-#. type: Plain text
-#: dpkg-architecture.1:198
+#: dpkg-architecture.1:175
 msgid ""
-"The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
-"dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
-"on dpkg-dev (E<gt>= 1.15.4)."
+"Note that you can also rely on an external Makefile snippet to properly set "
+"all the variables that B<dpkg-architecture> can provide:"
 msgstr ""
-"Die Variablen DEB_*_ARCH_BITS und DEB_*_ARCH_ENDIAN wurden in dpkg-dev "
-"1.15.4 eingeführt. Werden sie in I<debian/rules> verwandt, benötigen sie "
-"daher eine Bauabhängigkeit von dpkg-dev (E<gt>= 1.15.4)."
+"Beachten Sie, dass Sie sich auch auf ein externes Makefile-Schnipsel "
+"abstützen können, um alle Variablen, die B<dpkg-architecture> bereitstellen "
+"kann, korrekt zu setzen:"
 
 #. type: Plain text
-#: dpkg-architecture.1:203
-msgid ""
-"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
-"dev 1.13.2. Before this I<debian/rules> files tended to check the values of "
-"the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have been subject "
-"to change."
-msgstr ""
-"Die DEB_HOST_ARCH_CPU- und DEB_HOST_ARCH_OS-Variablen wurden in dpkg-dev "
-"1.13.2 eingeführt. Vorher tendierten die I<debian/rules>-Dateien dazu, die "
-"Werte der DEB_HOST_GNU_CPU- oder DEB_HOST_GNU_TYPE-Variablen zu überprüfen, "
-"die aber Änderungen unterlagen."
-
-#. type: Plain text
-#: dpkg-architecture.1:208
-msgid ""
-"Where I<debian/rules> files check these variables to decide how or what to "
-"compile, this should be updated to use the new variables and values.  You "
-"may wish to retain backwards compatibility with older version of dpkg-dev by "
-"using the following code:"
-msgstr ""
-"Wo I<debian/rules>-Dateien diese Variablen überprüfen um festzustellen, wie "
-"oder was zu kompilieren ist, sollten diese aktualisiert werden, um die neuen "
-"Variablen und Werte zu verwenden. Sie möchten eventuell "
-"Rückwärtskompatibilität zu älteren Versionen von Dpkg-dev erhalten, indem "
-"Sie den folgenden Code verwenden:"
-
-#. type: Plain text
-#: dpkg-architecture.1:212
-#, no-wrap
-msgid ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
-msgstr ""
-"DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
-"DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
-
-#. type: Plain text
-#: dpkg-architecture.1:226
+#: dpkg-architecture.1:178
 #, no-wrap
-msgid ""
-"# Take account of old dpkg-architecture output.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
-msgstr ""
-"# Berücksichtige die Ausgabe des alten Dpkg-architecture.\n"
-"ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-"  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-"  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-"    DEB_HOST_ARCH_CPU := amd64\n"
-"  endif\n"
-"endif\n"
-"ifeq ($(DEB_HOST_ARCH_OS),)\n"
-"  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
-"  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-"    DEB_HOST_ARCH_OS := hurd\n"
-"  endif\n"
-"endif\n"
+msgid "include /usr/share/dpkg/architecture.mk\n"
+msgstr "include /usr/share/dpkg/architecture.mk\n"
 
 #. type: Plain text
-#: dpkg-architecture.1:229
-msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
-msgstr "Und ähnlich für DEB_BUILD_ARCH_CPU und DEB_BUILD_ARCH_OS."
-
-#. type: Plain text
-#: dpkg-architecture.1:232
+#: dpkg-architecture.1:186
 msgid ""
-"If you still wish to support versions of dpkg-dev that did not include "
-"B<dpkg-architecture>, the following does the job:"
+"In any case, you should never use B<dpkg --print-architecture> to get "
+"architecture information during a package build."
 msgstr ""
-"Falls Sie noch Versionen von Dpkg-dev, die B<dpkg-architecture> nicht "
-"enthielten, unterstützen wollen, erledigt dies folgendes:"
+"Auf jeden Fall sollten Sie niemals B<dpkg --print-architecture> verwenden, um "
+"die Architekturinformationen während eines Paketbaus zu erhalten."
 
-#. type: Plain text
-#: dpkg-architecture.1:242
+#. type: SH
+#: dpkg-architecture.1:187
 #, no-wrap
-msgid ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-msgstr ""
-"\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-"\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
-"ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-"else\n"
-"  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-"endif\n"
-"DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+msgid "BACKWARD COMPATIBILITY"
+msgstr "RÜCKWÄRTSKOMPATIBILITÄT"
 
 #. type: Plain text
-#: dpkg-architecture.1:247
-#, no-wrap
+#: dpkg-architecture.1:190
 msgid ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"The /usr/share/dpkg/architecture.mk Makefile snippet is provided by dpkg-dev "
+"since version 1.16.1."
 msgstr ""
-"\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-"\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+"Das Makefile-Schnipsel /usr/share/dpkg/architecture.mk wird von dpkg-dev "
+"seit Version 1.16.1 bereitgestellt."
 
 #. type: Plain text
-#: dpkg-architecture.1:251
+#: dpkg-architecture.1:194
 msgid ""
-"Put a subset of these lines at the top of your debian/rules file; these "
-"default values will be overwritten if dpkg-architecture is used."
+"The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in dpkg-"
+"dev 1.15.4. Using them in I<debian/rules> thus requires a build-dependency "
+"on dpkg-dev (E<gt>= 1.15.4)."
 msgstr ""
-"Setzen Sie eine Untermenge dieser Zeilen oben in Ihre debian/rules-Datei; "
-"diese Standardwerte werden überschrieben, falls Dpkg-architecture verwendet "
-"wird."
+"Die Variablen DEB_*_ARCH_BITS und DEB_*_ARCH_ENDIAN wurden in dpkg-dev "
+"1.15.4 eingeführt. Werden sie in I<debian/rules> verwandt, benötigen sie "
+"daher eine Bauabhängigkeit von dpkg-dev (E<gt>= 1.15.4)."
 
 #. type: Plain text
-#: dpkg-architecture.1:258
+#: dpkg-architecture.1:197
 msgid ""
-"You don't need the full set. Choose a consistent set which contains the "
-"values you use in the rules file. For example, if you only need the host "
-"Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-"sufficient (this is indeed the Debian architecture of the build machine, but "
-"remember that we are only trying to be backward compatible with native "
-"compilation)."
+"The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in dpkg-"
+"dev 1.13.2."
 msgstr ""
-"Sie benötigen nicht den ganzen Satz. Wählen Sie einen konsistenten Satz, der "
-"nur die Werte enthält, die Sie in der rules-Datei verwenden. Falls Sie "
-"beispielsweise nur die Host-Debian-Architektur benötigen, ist »DEB_HOST_ARCH="
-"\\`dpkg --print-architecture\\ ausreichend (dies ist in der Tat die Debian-"
-"Architektur der Baumaschine, aber denken Sie daran, dass wir nur zur "
-"»natürlichen« Kompilierung rückwärtskompatibel sein wollen)."
+"Die Variablen DEB_HOST_ARCH_CPU und DEB_HOST_ARCH_OS wurden in dpkg-dev "
+"1.13.2 eingeführt."
 
 #. type: Plain text
-#: dpkg-architecture.1:261
+#: dpkg-architecture.1:200
 msgid ""
 "The B<-e> and B<-i> options were only introduced in relatively recent "
 "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
@@ -6288,7 +6145,7 @@ msgstr ""
 "B<dpkg-architecture> eingeführt (seit Dpkg 1.13.13)."
 
 #. type: Plain text
-#: dpkg-architecture.1:265
+#: dpkg-architecture.1:204
 msgid ""
 "B<dpkg-buildpackage> accepts the B<-a> option and passes it to B<dpkg-"
 "architecture>. Other examples:"
@@ -6297,17 +6154,17 @@ msgstr ""
 "architecture> weiter. Weitere Beispiele:"
 
 #. type: Plain text
-#: dpkg-architecture.1:267
+#: dpkg-architecture.1:206
 msgid "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 msgstr "CC=i386-gnu-gcc dpkg-architecture -c debian/rules build"
 
 #. type: Plain text
-#: dpkg-architecture.1:269
+#: dpkg-architecture.1:208
 msgid "eval \\`dpkg-architecture -u\\`"
 msgstr "eval \\`dpkg-architecture -u\\`"
 
 #. type: Plain text
-#: dpkg-architecture.1:272
+#: dpkg-architecture.1:211
 msgid ""
 "Check if an architecture is equal to the current architecture or a given one:"
 msgstr ""
@@ -6315,17 +6172,17 @@ msgstr ""
 "einer übergebenen ist:"
 
 #. type: Plain text
-#: dpkg-architecture.1:274
+#: dpkg-architecture.1:213
 msgid "dpkg-architecture -elinux-alpha"
 msgstr "dpkg-architecture -elinux-alpha"
 
 #. type: Plain text
-#: dpkg-architecture.1:276
+#: dpkg-architecture.1:215
 msgid "dpkg-architecture -amips -elinux-mips"
 msgstr "dpkg-architecture -amips -elinux-mips"
 
 #. type: Plain text
-#: dpkg-architecture.1:279
+#: dpkg-architecture.1:218
 msgid ""
 "Check if the current architecture or an architecture provided with -a are "
 "Linux systems:"
@@ -6334,17 +6191,17 @@ msgstr ""
 "Systeme sind:"
 
 #. type: Plain text
-#: dpkg-architecture.1:281
+#: dpkg-architecture.1:220
 msgid "dpkg-architecture -ilinux-any"
 msgstr "dpkg-architecture -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:283
+#: dpkg-architecture.1:222
 msgid "dpkg-architecture -ai386 -ilinux-any"
 msgstr "dpkg-architecture -ai386 -ilinux-any"
 
 #. type: Plain text
-#: dpkg-architecture.1:288
+#: dpkg-architecture.1:227
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
@@ -6355,36 +6212,36 @@ msgstr ""
 "B<DPKG_DATADIR> überschrieben werden."
 
 #. type: TP
-#: dpkg-architecture.1:288
+#: dpkg-architecture.1:227
 #, no-wrap
 msgid "I</usr/share/dpkg/cputable>"
 msgstr "I</usr/share/dpkg/cputable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:291
+#: dpkg-architecture.1:230
 msgid "Table of known CPU names and mapping to their GNU name."
 msgstr "Tabelle der bekannten CPU-Namen und Abbildungen auf ihre GNU-Namen."
 
 #. type: TP
-#: dpkg-architecture.1:291
+#: dpkg-architecture.1:230
 #, no-wrap
 msgid "I</usr/share/dpkg/ostable>"
 msgstr "I</usr/share/dpkg/ostable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:294
+#: dpkg-architecture.1:233
 msgid "Table of known operating system names and mapping to their GNU name."
 msgstr ""
 "Tabelle der bekannten Betriebssystemnamen und Abbildungen auf ihre GNU-Namen."
 
 #. type: TP
-#: dpkg-architecture.1:294
+#: dpkg-architecture.1:233
 #, no-wrap
 msgid "I</usr/share/dpkg/triplettable>"
 msgstr "I</usr/share/dpkg/triplettable>"
 
 #. type: Plain text
-#: dpkg-architecture.1:298
+#: dpkg-architecture.1:237
 msgid ""
 "Mapping between Debian architecture triplets and Debian architecture names."
 msgstr ""
@@ -6392,12 +6249,12 @@ msgstr ""
 "Architekturnamen."
 
 #. type: Plain text
-#: dpkg-architecture.1:302
+#: dpkg-architecture.1:241
 msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 
 #. type: Plain text
-#: dpkg-architecture.1:307
+#: dpkg-architecture.1:246
 msgid ""
 "B<dpkg-architecture> and this man page were initially written by Marcus "
 "Brinkmann E<lt>brinkmd@debian.orgE<gt>."
@@ -9595,7 +9452,7 @@ msgstr ""
 "hinzu, deren Steuerdateien es hier generiert."
 
 #. type: Plain text
-#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:337
+#: dpkg-gencontrol.1:148 dpkg-shlibdeps.1:340
 msgid "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 msgstr "Copyright \\(co 2007-2008 Rapha\\[:e]l Hertzog"
 
@@ -13219,16 +13076,16 @@ msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol I<sym> used "
 "by I<binary> found in none of the libraries\", bit 1 (value=2) enables the "
-"warning \"dependency on I<library> could be avoided\" and bit 2 (value=4)  "
-"enables the warning \"I<binary> shouldn't be linked with I<library>\".  The "
-"default I<value> is 3: the first two warnings are active by default, the "
+"warning \"package could avoid a useless dependency\" and bit 2 (value=4)  "
+"enables the warning \"I<binary> should not be linked against I<library>\".  "
+"The default I<value> is 3: the first two warnings are active by default, the "
 "last one is not. Set I<value> to 7 if you want all warnings to be active."
 msgstr ""
 "I<Wert> ist ein Bitfeld, das den Satz an Warnungen definiert, die von B<dpkg-"
 "shlibdeps> ausgegeben werden können. Bit 0 (Wert=1) aktiviert die Warnung "
 "»Symbol I<Sym>, verwendet von I<Programm>, in keiner der Bibliotheken "
-"gefunden.«, Bit 1 (Wert=2) aktiviert die Warnung »Abhängigkeit von "
-"I<Bibliothek> könnte vermieden werden« und Bit 2 (Wert=4) aktiviert die "
+"gefunden.«, Bit 1 (Wert=2) aktiviert die Warnung »Das Paket könnte eine "
+"nutzlose Abhängigkeit vermeiden« und Bit 2 (Wert=4) aktiviert die "
 "Warnung »I<Programm> sollte nicht gegen I<Bibliothek> gelinkt werden«. "
 "Standardmäßig ist I<Wert> 3: die ersten zwei Warnungen sind standardmäßig "
 "aktiv, die letzte nicht. Setzten Sie I<Wert> auf 7, falls Sie möchten, dass "
@@ -13312,8 +13169,11 @@ msgstr ""
 #. type: TP
 #: dpkg-shlibdeps.1:249
 #, no-wrap
-msgid "B<dependency on >I<library>B< could be avoided if >I<binaries>B< were not uselessly linked against it (they use none of its symbols).>"
-msgstr "B<Abhängigkeit von >I<Bibliothek>B< könnte vermieden werden, falls >I<Programm>B< nicht unnötigerweise dagegen gelinkt wäre (es verwendet keines seiner Symbole.>"
+msgid "B<package could avoid a useless dependency if >I<binary>B< was not linked against >I<library>B< (it uses none of the library's symbols)>"
+msgstr ""
+"B<Das Paket könnte eine nutzlose Abhängigkeit vermeiden, falls >I<Programm>B< "
+"nicht gegen >I<Bibliothek>B< gelinkt wäre (es verwendet keines der Symbole "
+"der Bibliothek).>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.1:255
@@ -13332,11 +13192,27 @@ msgstr ""
 #. type: TP
 #: dpkg-shlibdeps.1:255
 #, no-wrap
-msgid "I<binary>B< shouldn't be linked with >I<library>B< (it uses none of its symbols).>"
-msgstr "I<Programm>B< sollte nicht gegen >I<Bibliothek>B< gelinkt werden (es verwendet keines ihrer Symbole).>"
+msgid "B<package could avoid a useless dependency if >I<binaries>B< were not linked against >I<library>B< (they uses none of the library's symbols)>"
+msgstr ""
+"B<Das Paket könnte eine nutzlose Abhängigkeit vermeiden, falls >I<Programme>B< "
+"nicht gegen >I<Bibliothek>B< gelinkt wären (sie verwenden keines der Symbole "
+"der Bibliothek).>"
+
+#. type: Plain text
+#: dpkg-shlibdeps.1:258
+msgid "Exactly the same as the above warning, but for multiple binaries."
+msgstr "Exakt das gleiche wie die obige Warnung, aber für mehrere Programme."
+
+#. type: TP
+#: dpkg-shlibdeps.1:258
+#, no-wrap
+msgid "I<binary>B< should not be linked against >I<library>B< (it uses none of the library's symbols)>"
+msgstr ""
+"I<Programm>B< sollte nicht gegen >I<Bibliothek>B< gelinkt werden (es "
+"verwendet keines der Bibliotheks-Symbole).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:262
+#: dpkg-shlibdeps.1:265
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -13352,13 +13228,13 @@ msgstr ""
 "überprüften Programme."
 
 #. type: SH
-#: dpkg-shlibdeps.1:262
+#: dpkg-shlibdeps.1:265
 #, no-wrap
 msgid "ERRORS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:269
+#: dpkg-shlibdeps.1:272
 msgid ""
 "B<dpkg-shlibdeps> will fail if it can't find a public library used by a "
 "binary or if this library has no associated dependency information (either "
@@ -13375,13 +13251,13 @@ msgstr ""
 "sein."
 
 #. type: TP
-#: dpkg-shlibdeps.1:269
+#: dpkg-shlibdeps.1:272
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
 msgstr "B<konnte Bibliothek >I<SONAME-der-Bibliothek>B< benötigt von >I<Programm>B< nicht finden (ihr RPATH ist »>I<rpath>B<«).>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:285
+#: dpkg-shlibdeps.1:288
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -13409,7 +13285,7 @@ msgstr ""
 "dieser Verzeichnisse gefunden wird, erhalten Sie diesen Fehler."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:291
+#: dpkg-shlibdeps.1:294
 msgid ""
 "If the library not found is in a private directory of the same package, then "
 "you want to add the directory to LD_LIBRARY_PATH. If it's in another binary "
@@ -13426,13 +13302,13 @@ msgstr ""
 "Verzeichnis liegt."
 
 #. type: TP
-#: dpkg-shlibdeps.1:291
+#: dpkg-shlibdeps.1:294
 #, no-wrap
 msgid "B<no dependency information found for >I<library-file>B< (used by >I<binary>B<).>"
 msgstr "B<Keine Abhängigkeitsinformationen für >I<Bibliotheksdatei>B< (verwendet von >I<Programm>B<) gefunden.>"
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:304
+#: dpkg-shlibdeps.1:307
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -13450,7 +13326,7 @@ msgstr ""
 "verschiedenen Paketbaubäume ((debian/*/DEBIAN/)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:318
+#: dpkg-shlibdeps.1:321
 msgid ""
 "This failure can be caused by a bad or missing shlibs or symbols file in the "
 "package of the library. It might also happen if the library is built within "
@@ -13477,7 +13353,7 @@ msgstr ""
 "ist immer am besten, den RPATH zu bereinigen, um Probleme zu vermeiden."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:324
+#: dpkg-shlibdeps.1:327
 msgid ""
 "Calling B<dpkg-shlibdeps> in verbose mode (-v) will provide much more "
 "information about where it tried to find the dependency information. This "
@@ -13489,12 +13365,12 @@ msgstr ""
 "nicht verstehen, warum es Ihnen diesen Fehler meldet."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:328
+#: dpkg-shlibdeps.1:331
 msgid "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 msgstr "B<deb-shlibs>(5), B<deb-symbols>(5), B<dpkg-gensymbols>(1)."
 
 #. type: Plain text
-#: dpkg-shlibdeps.1:335
+#: dpkg-shlibdeps.1:338
 msgid "Copyright \\(co 2006 Frank Lichtenheld"
 msgstr "Copyright \\(co 2006 Frank Lichtenheld"
 
@@ -17611,8 +17487,8 @@ msgid ""
 msgstr ""
 "Prüfe, ob ein Prozess I<pid-Datei> erstellt hat. Hinweis: Wird diese "
 "Abgleichoption alleine verwandt, könnte auf nicht geplante Prozesse "
-"eingewirkt werden, falls der alte Prozess beendet wurde, ohne dass er "
-"I<pid-Datei> entfernen konnte."
+"eingewirkt werden, falls der alte Prozess beendet wurde, ohne dass er I<pid-"
+"Datei> entfernen konnte."
 
 #. type: TP
 #: start-stop-daemon.8:87
@@ -19197,6 +19073,172 @@ msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ msgid "Instead of:"
+#~ msgstr "Anstatt von:"
+
+#~ msgid ""
+#~ "ARCH=\\`dpkg --print-architecture\\`\n"
+#~ "configure $(\\s-1ARCH\\s0)-linux\n"
+#~ msgstr ""
+#~ "ARCH=\\`dpkg --print-architecture\\`\n"
+#~ "configure $(\\s-1ARCH\\s0)-linux\n"
+
+#~ msgid "please use the following:"
+#~ msgstr "verwenden Sie bitte das folgende:"
+
+#~ msgid "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+#~ msgstr "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host=$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
+
+#~ msgid ""
+#~ "ARCH=\\`dpkg --print-architecture\\`\n"
+#~ "ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+#~ "  ...\n"
+#~ "endif\n"
+#~ msgstr ""
+#~ "ARCH=\\`dpkg --print-architecture\\`\n"
+#~ "ifeq ($(\\s-1ARCH\\s0),alpha)\n"
+#~ "  ...\n"
+#~ "endif\n"
+
+#~ msgid "please use:"
+#~ msgstr "bitte verwenden Sie:"
+
+#~ msgid ""
+#~ "In general, calling dpkg in the rules file to get architecture "
+#~ "information is deprecated (unless you want to provide backward "
+#~ "compatibility, see below).  Especially the --print-architecture option is "
+#~ "unreliable since we have Debian architectures which don't equal a "
+#~ "processor name."
+#~ msgstr ""
+#~ "Im Allgemeinen wird der Aufruf von Dpkg in der »rules«-Datei, um "
+#~ "Architektur-Informationen zu erhalten, abgelehnt (falls Sie "
+#~ "Rückwärtskompatibilität bereitstellen wollen, siehe unten). Insbesondere "
+#~ "die --print-architecture-Option ist unzuverlässig, da wir Debian-"
+#~ "Architekturen haben, die nicht mit einem Prozessornamen übereinstimmen."
+
+#~ msgid ""
+#~ "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in "
+#~ "dpkg-dev 1.13.2. Before this I<debian/rules> files tended to check the "
+#~ "values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have "
+#~ "been subject to change."
+#~ msgstr ""
+#~ "Die DEB_HOST_ARCH_CPU- und DEB_HOST_ARCH_OS-Variablen wurden in dpkg-dev "
+#~ "1.13.2 eingeführt. Vorher tendierten die I<debian/rules>-Dateien dazu, "
+#~ "die Werte der DEB_HOST_GNU_CPU- oder DEB_HOST_GNU_TYPE-Variablen zu "
+#~ "überprüfen, die aber Änderungen unterlagen."
+
+#~ msgid ""
+#~ "Where I<debian/rules> files check these variables to decide how or what "
+#~ "to compile, this should be updated to use the new variables and values.  "
+#~ "You may wish to retain backwards compatibility with older version of dpkg-"
+#~ "dev by using the following code:"
+#~ msgstr ""
+#~ "Wo I<debian/rules>-Dateien diese Variablen überprüfen um festzustellen, "
+#~ "wie oder was zu kompilieren ist, sollten diese aktualisiert werden, um "
+#~ "die neuen Variablen und Werte zu verwenden. Sie möchten eventuell "
+#~ "Rückwärtskompatibilität zu älteren Versionen von Dpkg-dev erhalten, indem "
+#~ "Sie den folgenden Code verwenden:"
+
+#~ msgid ""
+#~ "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+#~ "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+#~ msgstr ""
+#~ "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/dev/null)\n"
+#~ "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/dev/null)\n"
+
+#~ msgid ""
+#~ "# Take account of old dpkg-architecture output.\n"
+#~ "ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+#~ "  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+#~ "  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+#~ "    DEB_HOST_ARCH_CPU := amd64\n"
+#~ "  endif\n"
+#~ "endif\n"
+#~ "ifeq ($(DEB_HOST_ARCH_OS),)\n"
+#~ "  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+#~ "  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+#~ "    DEB_HOST_ARCH_OS := hurd\n"
+#~ "  endif\n"
+#~ "endif\n"
+#~ msgstr ""
+#~ "# Berücksichtige die Ausgabe des alten Dpkg-architecture.\n"
+#~ "ifeq ($(DEB_HOST_ARCH_CPU),)\n"
+#~ "  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
+#~ "  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
+#~ "    DEB_HOST_ARCH_CPU := amd64\n"
+#~ "  endif\n"
+#~ "endif\n"
+#~ "ifeq ($(DEB_HOST_ARCH_OS),)\n"
+#~ "  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))\n"
+#~ "  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
+#~ "    DEB_HOST_ARCH_OS := hurd\n"
+#~ "  endif\n"
+#~ "endif\n"
+
+#~ msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
+#~ msgstr "Und ähnlich für DEB_BUILD_ARCH_CPU und DEB_BUILD_ARCH_OS."
+
+#~ msgid ""
+#~ "If you still wish to support versions of dpkg-dev that did not include "
+#~ "B<dpkg-architecture>, the following does the job:"
+#~ msgstr ""
+#~ "Falls Sie noch Versionen von Dpkg-dev, die B<dpkg-architecture> nicht "
+#~ "enthielten, unterstützen wollen, erledigt dies folgendes:"
+
+#~ msgid ""
+#~ "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+#~ "\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+#~ "ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+#~ "else\n"
+#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+#~ "endif\n"
+#~ "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+#~ msgstr ""
+#~ "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
+#~ "\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH\\s0))\n"
+#~ "ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
+#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
+#~ "else\n"
+#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
+#~ "endif\n"
+#~ "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+
+#~ msgid ""
+#~ "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+#~ msgstr ""
+#~ "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
+#~ "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
+
+#~ msgid ""
+#~ "Put a subset of these lines at the top of your debian/rules file; these "
+#~ "default values will be overwritten if dpkg-architecture is used."
+#~ msgstr ""
+#~ "Setzen Sie eine Untermenge dieser Zeilen oben in Ihre debian/rules-Datei; "
+#~ "diese Standardwerte werden überschrieben, falls Dpkg-architecture "
+#~ "verwendet wird."
+
+#~ msgid ""
+#~ "You don't need the full set. Choose a consistent set which contains the "
+#~ "values you use in the rules file. For example, if you only need the host "
+#~ "Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
+#~ "sufficient (this is indeed the Debian architecture of the build machine, "
+#~ "but remember that we are only trying to be backward compatible with "
+#~ "native compilation)."
+#~ msgstr ""
+#~ "Sie benötigen nicht den ganzen Satz. Wählen Sie einen konsistenten Satz, "
+#~ "der nur die Werte enthält, die Sie in der rules-Datei verwenden. Falls "
+#~ "Sie beispielsweise nur die Host-Debian-Architektur benötigen, ist "
+#~ "»DEB_HOST_ARCH=\\`dpkg --print-architecture\\ ausreichend (dies ist in "
+#~ "der Tat die Debian-Architektur der Baumaschine, aber denken Sie daran, "
+#~ "dass wir nur zur »natürlichen« Kompilierung rückwärtskompatibel sein "
+#~ "wollen)."
+
 #~ msgid "Check whether a process has created the file I<pid-file>."
 #~ msgstr "Überprüfe, ob ein Prozess die Datei I<pid-Datei> angelegt hat."
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index eee5f9611..6ea991015 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -1,13 +1,13 @@
 # German translation of the scripts in the dpkg package
 # This file is distributed under the same license as the dpkg package.
-# (C) Helge Kreutzmann <debian@helgefjell.de>, 2007-2011.
+# (C) Helge Kreutzmann <debian@helgefjell.de>, 2007-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-12-29 19:41+0100\n"
-"PO-Revision-Date: 2011-12-29 19:48+0100\n"
+"POT-Creation-Date: 2012-01-20 19:22+0100\n"
+"PO-Revision-Date: 2012-01-20 19:38+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl:57 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
-#: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:533
+#: scripts/dpkg-scansources.pl:78 scripts/dpkg-shlibdeps.pl:535
 #: scripts/dpkg-source.pl:455 scripts/changelog/debian.pl:34
 #, perl-format
 msgid "Debian %s version %s.\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: scripts/dpkg-buildpackage.pl:44 scripts/dpkg-distaddfile.pl:39
 #: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:63
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
-#: scripts/dpkg-shlibdeps.pl:542 scripts/dpkg-source.pl:462
+#: scripts/dpkg-shlibdeps.pl:544 scripts/dpkg-source.pl:462
 #: scripts/changelog/debian.pl:39
 msgid ""
 "\n"
@@ -610,7 +610,7 @@ msgid "install new files list file"
 msgstr "neue Dateienliste-Datei installieren"
 
 #: scripts/dpkg-distaddfile.pl:106 scripts/dpkg-gencontrol.pl:378
-#: scripts/dpkg-gencontrol.pl:395 scripts/dpkg-shlibdeps.pl:523
+#: scripts/dpkg-gencontrol.pl:395 scripts/dpkg-shlibdeps.pl:525
 #: scripts/Dpkg/Interface/Storable.pm:91
 #: scripts/Dpkg/Interface/Storable.pm:119 scripts/Dpkg/Source/Patch.pm:290
 #: scripts/Dpkg/Source/Package/V2.pm:607
@@ -932,7 +932,7 @@ msgid "%s package with udeb specific field %s"
 msgstr "%s Paket mit udeb-spezifischem Feld %s"
 
 #: scripts/dpkg-gencontrol.pl:305 scripts/dpkg-scansources.pl:313
-#: scripts/dpkg-shlibdeps.pl:836 scripts/Dpkg/Changelog/Parse.pm:138
+#: scripts/dpkg-shlibdeps.pl:838 scripts/Dpkg/Changelog/Parse.pm:138
 #: scripts/Dpkg/IPC.pm:229 scripts/Dpkg/Shlibs/Objdump.pm:181
 #, perl-format
 msgid "cannot fork for %s"
@@ -943,7 +943,7 @@ msgstr "fork kann für %s nicht ausgeführt werden"
 msgid "chdir for du to `%s'"
 msgstr "chdir nach »%s« für du"
 
-#: scripts/dpkg-gencontrol.pl:310 scripts/dpkg-shlibdeps.pl:843
+#: scripts/dpkg-gencontrol.pl:310 scripts/dpkg-shlibdeps.pl:845
 #: scripts/Dpkg/IPC.pm:271 scripts/Dpkg/Shlibs/Cppfilt.pm:50
 #, perl-format
 msgid "unable to execute %s"
@@ -1596,20 +1596,28 @@ msgstr[1] ""
 
 #: scripts/dpkg-shlibdeps.pl:409
 #, perl-format
-msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
+msgid ""
+"%s should not be linked against %s (it uses none of the library's symbols)."
 msgstr ""
-"%s sollte nicht gegen %s gelinkt werden (es verwendet keines ihrer Symbole)."
+"%s sollte nicht gegen %s gelinkt werden (es verwendet keines der "
+"Bibliotheks-Symbole)."
 
 #: scripts/dpkg-shlibdeps.pl:422
 #, perl-format
 msgid ""
-"dependency on %s could be avoided if \"%s\" were not uselessly linked "
-"against it (they use none of its symbols)."
-msgstr ""
-"Abhängigkeit von %s könnte vermieden werden, falls »%s« nicht unnötigerweise "
-"dagegen gelinkt wäre (es verwendet keines ihrer Symbole)."
+"package could avoid a useless dependency if %s was not linked against %s (it "
+"uses none of the library's symbols)."
+msgid_plural ""
+"package could avoid a useless dependency if %s were not linked against %s "
+"(they use none of the library's symbols)."
+msgstr[0] ""
+"Das Paket könnte eine nutzlose Abhängigkeit vermeiden, falls %s nicht gegen "
+"%s gelinkt wäre (es verwendet keines der Symbole der Bibliothek)."
+msgstr[1] ""
+"Das Paket könnte eine nutzlose Abhängigkeit vermeiden, falls %s nicht gegen "
+"%s gelinkt wären (sie verwenden keine der Symbole der Bibliothek)."
 
-#: scripts/dpkg-shlibdeps.pl:431
+#: scripts/dpkg-shlibdeps.pl:433
 msgid ""
 "Note: libraries are not searched in other binary packages that do not have "
 "any shlibs or symbols file.\n"
@@ -1621,38 +1629,38 @@ msgstr ""
 "Um dpkg-shlibdeps dabei zu helfen, private Bibliotheken zu finden, könnte es "
 "notwendig sein, LD_LIBRARY_PATH zu setzen."
 
-#: scripts/dpkg-shlibdeps.pl:434
+#: scripts/dpkg-shlibdeps.pl:436
 msgid "Cannot continue due to the error above."
 msgid_plural "Cannot continue due to the errors listed above."
 msgstr[0] "Kann wegen des vorangegangenen Fehlers nicht fortfahren."
 msgstr[1] "Kann wegen der vorangegangenen Fehler nicht fortfahren."
 
-#: scripts/dpkg-shlibdeps.pl:445
+#: scripts/dpkg-shlibdeps.pl:447
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "neue Substvars-Datei »%s« öffnen"
 
-#: scripts/dpkg-shlibdeps.pl:448
+#: scripts/dpkg-shlibdeps.pl:450
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "alte Varlist-Datei »%s« zum Lesen öffnen"
 
-#: scripts/dpkg-shlibdeps.pl:451
+#: scripts/dpkg-shlibdeps.pl:453
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr "alte Einträge in die neue Varlist-Datei »%s« kopieren"
 
-#: scripts/dpkg-shlibdeps.pl:515
+#: scripts/dpkg-shlibdeps.pl:517
 #, perl-format
 msgid "invalid dependency got generated: %s"
 msgstr "ungültige Abhängigkeit wurde erstellt: %s"
 
-#: scripts/dpkg-shlibdeps.pl:525
+#: scripts/dpkg-shlibdeps.pl:527
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "neue Varlist-Datei »%s« installieren"
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:537
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1666,7 +1674,7 @@ msgstr ""
 "Copyright (C) 2006 Frank Lichtenheld.\n"
 "Copyright (C) 2007 Raphael Hertzog.\n"
 
-#: scripts/dpkg-shlibdeps.pl:550
+#: scripts/dpkg-shlibdeps.pl:552
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1731,30 +1739,30 @@ msgstr ""
 "Unterstützte Abhängigkeitsfelder sind:\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:677
+#: scripts/dpkg-shlibdeps.pl:679
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr ""
 "Name und Version können nicht aus Bibliotheksnamen »%s« entnommen werden"
 
-#: scripts/dpkg-shlibdeps.pl:684
+#: scripts/dpkg-shlibdeps.pl:686
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 "Informationsdatei für Laufzeitbibliothek »%s« kann nicht geöffnet werden"
 
-#: scripts/dpkg-shlibdeps.pl:690
+#: scripts/dpkg-shlibdeps.pl:692
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 "Informationsdatei »%s« der Laufzeitbibliothek, Zeile %d: ungültige Zeile »%s«"
 
-#: scripts/dpkg-shlibdeps.pl:749
+#: scripts/dpkg-shlibdeps.pl:751
 #, perl-format
 msgid "cannot open file %s"
 msgstr "Datei %s kann nicht geöffnet werden"
 
-#: scripts/dpkg-shlibdeps.pl:783
+#: scripts/dpkg-shlibdeps.pl:785
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1765,15 +1773,15 @@ msgstr ""
 "nicht identifiziert werden, da das DEBIAN-Unterverzeichnis in der Wurzel des "
 "Paketbaubaums fehlt."
 
-#: scripts/dpkg-shlibdeps.pl:848
+#: scripts/dpkg-shlibdeps.pl:850
 msgid "diversions involved - output may be incorrect"
 msgstr "Umleitungen beteiligt - Ausgabe könnte nicht korrekt sein"
 
-#: scripts/dpkg-shlibdeps.pl:850
+#: scripts/dpkg-shlibdeps.pl:852
 msgid "write diversion info to stderr"
 msgstr "Schreiben der Informationen zu Umleitungen auf Stderr"
 
-#: scripts/dpkg-shlibdeps.pl:854
+#: scripts/dpkg-shlibdeps.pl:856
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"