[Reproducible-commits] [dpkg] 01/02: Merge tag '1.16.9' into squeeze-backports
Holger Levsen
holger at layer-acht.org
Tue May 3 08:44:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to annotated tag 1.16.9_bpo60+1
in repository dpkg.
commit dc65da6aeadee1f9a8d6790f13a185122b1ae037
Merge: 4096682 5de3f21
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Mon Jan 14 10:34:30 2013 +0100
Merge tag '1.16.9' into squeeze-backports
Conflicts:
debian/control
debian/rules
man/po/po4a.cfg
scripts/dpkg-architecture.pl
scripts/mk/architecture.mk
Multiple adaptations were required due to refactoring that happened
between 1.16.1.2 and 1.16.9.
.gitignore | 1 +
.mailmap | 6 +
ChangeLog.old | 2 +-
Makecheck.am | 2 +-
Makefile.am | 13 +-
README | 80 +-
TODO | 5 -
abitable | 10 +
configure.ac | 27 +-
cputable | 1 +
debian/changelog | 577 +-
debian/control | 10 +-
debian/dpkg-dev.docs | 1 +
debian/dpkg-dev.install | 28 -
debian/dpkg-dev.manpages | 29 +
debian/dpkg.install | 11 -
debian/dpkg.manpages | 11 +
debian/dpkg.postrm | 21 +-
debian/dpkg.prerm | 84 +-
debian/dselect.install | 2 -
debian/dselect.manpages | 2 +
debian/rules | 16 +-
debian/source/options | 4 +-
debian/usertags | 2 +
doc/Doxyfile.in | 520 +-
doc/README.feature-removal-schedule | 50 +-
doc/coding-style.txt | 61 +-
doc/frontend.txt | 24 +
doc/triggers.txt | 208 +-
dpkg-deb/Makefile.am | 1 +
dpkg-deb/build.c | 44 +-
dpkg-deb/dpkg-deb.h | 10 +-
dpkg-deb/extract.c | 111 +-
dpkg-deb/info.c | 27 +-
dpkg-deb/main.c | 53 +-
dpkg-split/Makefile.am | 2 +-
dpkg-split/dpkg-split.h | 9 +-
dpkg-split/info.c | 25 +-
dpkg-split/join.c | 9 +-
dpkg-split/main.c | 22 +-
dpkg-split/queue.c | 21 +-
dpkg-split/split.c | 20 +-
dselect/Makefile.am | 2 +-
dselect/basecmds.cc | 16 +-
dselect/baselist.cc | 58 +-
dselect/bindings.cc | 6 +-
dselect/dselect.h | 46 +-
dselect/main.cc | 54 +-
dselect/methlist.cc | 15 +-
dselect/method.h | 2 +-
dselect/methods/Debian/Dselect/Ftp.pm | 6 +-
dselect/methods/Makefile.am | 10 +-
dselect/methods/disk/install | 2 +-
dselect/methods/disk/setup | 62 +-
dselect/methods/floppy/desc.floppy | 2 +-
dselect/methods/ftp/install | 2 +-
dselect/methods/multicd/README.multicd | 30 +-
dselect/methods/multicd/install | 4 +-
dselect/methods/multicd/setup | 64 +-
dselect/methparse.cc | 27 +-
dselect/pkgcmds.cc | 40 +-
dselect/pkgdepcon.cc | 95 +-
dselect/pkgdisplay.cc | 33 +-
dselect/pkginfo.cc | 16 +-
dselect/pkglist.cc | 78 +-
dselect/pkglist.h | 10 +-
dselect/pkgsublist.cc | 44 +-
dselect/pkgtop.cc | 39 +-
dselect/po/bs.po | 269 +-
dselect/po/ca.po | 302 +-
dselect/po/cs.po | 310 +-
dselect/po/da.po | 491 +-
dselect/po/de.po | 305 +-
dselect/po/dselect.pot | 262 +-
dselect/po/el.po | 285 +-
dselect/po/es.po | 297 +-
dselect/po/et.po | 304 +-
dselect/po/eu.po | 467 +-
dselect/po/fr.po | 307 +-
dselect/po/gl.po | 313 +-
dselect/po/hu.po | 292 +-
dselect/po/id.po | 313 +-
dselect/po/it.po | 313 +-
dselect/po/ja.po | 440 +-
dselect/po/ko.po | 313 +-
dselect/po/nb.po | 311 +-
dselect/po/nl.po | 422 +-
dselect/po/nn.po | 285 +-
dselect/po/pl.po | 325 +-
dselect/po/pt.po | 313 +-
dselect/po/pt_BR.po | 313 +-
dselect/po/ro.po | 313 +-
dselect/po/ru.po | 430 +-
dselect/po/sk.po | 315 +-
dselect/po/sv.po | 305 +-
dselect/po/tl.po | 285 +-
dselect/po/vi.po | 325 +-
dselect/po/zh_CN.po | 313 +-
dselect/po/zh_TW.po | 370 +-
lib/compat/Makefile.am | 4 +
lib/compat/alphasort.c | 2 -
lib/compat/asprintf.c | 2 -
lib/compat/compat.h | 19 +-
lib/compat/empty.c | 1 +
lib/compat/gettext.h | 2 +-
lib/compat/obstack.c | 422 +-
lib/compat/obstack.h | 351 +-
lib/compat/scandir.c | 2 -
lib/compat/snprintf.c | 2 -
lib/compat/strerror.c | 2 -
lib/compat/{unsetenv.c => strndup.c} | 28 +-
lib/compat/strsignal.c | 2 -
lib/compat/unsetenv.c | 2 -
lib/compat/vasprintf.c | 2 -
lib/compat/vsnprintf.c | 14 +-
lib/dpkg/Makefile.am | 14 +-
lib/dpkg/ar.c | 17 +-
lib/dpkg/ar.h | 10 +
lib/dpkg/arch.c | 325 +
lib/dpkg/arch.h | 71 +
lib/dpkg/atomic-file.c | 124 +
lib/dpkg/{error.h => atomic-file.h} | 47 +-
lib/dpkg/buffer.c | 93 +-
lib/dpkg/buffer.h | 42 +-
lib/dpkg/command.c | 26 +-
lib/dpkg/command.h | 9 +
lib/dpkg/compress.c | 452 +-
lib/dpkg/compress.h | 63 +-
lib/dpkg/dbmodify.c | 41 +-
lib/dpkg/deb-version.c | 58 +
lib/dpkg/{dir.h => deb-version.h} | 21 +-
lib/dpkg/debug.h | 12 +
lib/dpkg/depcon.c | 84 +
lib/dpkg/dir.h | 8 +
lib/dpkg/dpkg-db.h | 192 +-
lib/dpkg/dpkg.h | 29 +-
lib/dpkg/dump.c | 292 +-
lib/dpkg/ehandle.c | 34 +-
lib/dpkg/ehandle.h | 25 +-
lib/dpkg/error.h | 12 +-
lib/dpkg/fdio.h | 8 +
lib/dpkg/fields.c | 223 +-
lib/dpkg/file.c | 27 +-
lib/dpkg/file.h | 9 +
lib/dpkg/glob.h | 8 +
lib/dpkg/i18n.h | 8 +
lib/dpkg/{libdpkg.Versions => libdpkg.map} | 97 +-
lib/dpkg/log.c | 4 +-
lib/dpkg/macros.h | 44 +-
lib/dpkg/md5.h | 2 -
lib/dpkg/mlib.c | 48 +-
lib/dpkg/namevalue.h | 8 +
lib/dpkg/options.c | 27 +-
lib/dpkg/options.h | 10 +-
lib/dpkg/parse.c | 252 +-
lib/dpkg/parsedump.h | 34 +-
lib/dpkg/parsehelp.c | 49 +-
lib/dpkg/path.c | 5 +-
lib/dpkg/path.h | 8 +
lib/dpkg/pkg-array.c | 4 +-
lib/dpkg/pkg-array.h | 8 +
lib/dpkg/pkg-db.c | 322 +-
lib/dpkg/pkg-format.c | 176 +-
lib/dpkg/pkg-format.h | 14 +-
lib/dpkg/pkg-list.h | 8 +
lib/dpkg/pkg-queue.h | 8 +
lib/dpkg/pkg-show.c | 162 +-
lib/dpkg/pkg-show.h | 18 +-
lib/dpkg/pkg-spec.c | 294 +
lib/dpkg/pkg-spec.h | 89 +
lib/dpkg/pkg.c | 158 +-
lib/dpkg/pkg.h | 20 +-
lib/dpkg/progname.h | 8 +
lib/dpkg/progress.c | 9 +-
lib/dpkg/progress.h | 8 +
lib/dpkg/report.c | 72 +
lib/dpkg/{progress.h => report.h} | 33 +-
lib/dpkg/string.h | 30 +-
lib/dpkg/subproc.h | 8 +
lib/dpkg/tarfn.c | 38 +-
lib/dpkg/tarfn.h | 32 +-
lib/dpkg/test.h | 13 +-
lib/dpkg/test/.gitignore | 3 +
lib/dpkg/test/Makefile.am | 8 +-
lib/dpkg/test/t-ar.c | 2 +-
lib/dpkg/test/t-arch.c | 200 +
lib/dpkg/test/t-buffer.c | 4 +-
lib/dpkg/test/t-command.c | 13 +-
lib/dpkg/test/t-deb-version.c | 69 +
lib/dpkg/test/t-macros.c | 7 +-
lib/dpkg/test/t-path.c | 7 +-
lib/dpkg/test/t-pkg-list.c | 34 +-
lib/dpkg/test/t-pkg-queue.c | 18 +-
lib/dpkg/test/t-pkginfo.c | 105 +-
lib/dpkg/test/{t-ar.c => t-trigger.c} | 29 +-
lib/dpkg/test/t-version.c | 146 +-
lib/dpkg/trigdeferred.h | 20 +-
lib/dpkg/trigdeferred.l | 9 +-
lib/dpkg/triglib.c | 267 +-
lib/dpkg/triglib.h | 34 +-
lib/dpkg/trignote.c | 11 +-
lib/dpkg/utils.c | 2 +-
lib/dpkg/varbuf.c | 4 +-
lib/dpkg/varbuf.h | 10 +-
lib/dpkg/vercmp.c | 119 -
lib/dpkg/version.c | 167 +-
lib/dpkg/version.h | 49 +-
m4/dpkg-arch.m4 | 3 +-
m4/dpkg-build.m4 | 34 +-
m4/dpkg-coverage.m4 | 2 +
m4/dpkg-libs.m4 | 8 +
m4/dpkg-progs.m4 | 12 +-
m4/dpkg-types.m4 | 23 +-
man/Makefile.am | 9 +-
man/deb-control.5 | 28 +-
man/deb-extra-override.5 | 17 +
man/deb-old.5 | 19 +
man/deb-origin.5 | 57 +
man/deb-override.5 | 10 +-
man/deb-shlibs.5 | 12 +-
man/deb-split.5 | 28 +-
man/deb-src-control.5 | 71 +-
man/deb-substvars.5 | 28 +-
man/deb-symbols.5 | 28 +-
man/deb-triggers.5 | 18 +
man/deb-version.5 | 30 +-
man/deb.5 | 28 +-
man/dpkg-architecture.1 | 131 +-
man/dpkg-buildflags.1 | 64 +-
man/dpkg-buildpackage.1 | 67 +-
man/dpkg-checkbuilddeps.1 | 44 +-
man/dpkg-deb.1 | 38 +-
man/dpkg-distaddfile.1 | 32 +-
man/dpkg-divert.8 | 28 +-
man/dpkg-genchanges.1 | 65 +-
man/dpkg-gencontrol.1 | 59 +-
man/dpkg-gensymbols.1 | 48 +-
man/dpkg-maintscript-helper.1 | 102 +-
man/dpkg-mergechangelogs.1 | 23 +-
man/dpkg-name.1 | 33 +-
man/dpkg-parsechangelog.1 | 94 +-
man/dpkg-query.1 | 87 +-
man/dpkg-scanpackages.1 | 21 +-
man/dpkg-scansources.1 | 22 +-
man/dpkg-shlibdeps.1 | 84 +-
man/dpkg-source.1 | 85 +-
man/dpkg-split.1 | 27 +-
man/dpkg-statoverride.8 | 24 +-
man/dpkg-trigger.1 | 21 +-
man/dpkg-vendor.1 | 27 +-
man/dpkg.1 | 96 +-
man/dpkg.cfg.5 | 18 +
man/dselect.1 | 34 +-
man/dselect.cfg.5 | 18 +
man/po/de.add | 2 +-
man/po/de.po | 7281 +++++----
man/po/dpkg-man.pot | 5617 +++----
man/po/es.po | 9810 ++++++-------
man/po/fr.po | 9348 ++++++------
man/po/hu.po | 6050 ++++----
man/po/ja.add | 10 +-
man/po/ja.po | 15490 +++++++++++---------
man/po/pl.add | 2 +
man/po/pl.po | 10585 +++++++------
man/po/po4a.cfg | 3 +
man/po/pt_BR.po | 6067 ++++----
man/po/ru.po | 6234 ++++----
man/po/sv.po | 7044 +++++----
man/start-stop-daemon.8 | 76 +-
man/update-alternatives.8 | 83 +-
ostable | 2 +
po/POTFILES.in | 12 +-
po/ast.po | 3848 +++--
po/bs.po | 3160 ++--
po/ca.po | 5836 +++-----
po/cs.po | 4427 +++---
po/da.po | 5286 +++----
po/de.po | 3742 ++---
po/dpkg.pot | 3103 ++--
po/dz.po | 3729 +++--
po/el.po | 3764 +++--
po/eo.po | 4797 +++---
po/es.po | 3982 ++---
po/et.po | 3659 +++--
po/eu.po | 3885 +++--
po/fr.po | 3982 ++---
po/gl.po | 3793 +++--
po/hu.po | 3730 +++--
po/id.po | 3847 +++--
po/it.po | 4829 +++---
po/ja.po | 4635 +++---
po/km.po | 3673 +++--
po/ko.po | 3870 +++--
po/ku.po | 3352 +++--
po/lt.po | 3598 +++--
po/mr.po | 3666 +++--
po/nb.po | 3877 +++--
po/ne.po | 3671 +++--
po/nl.po | 3721 +++--
po/nn.po | 3596 +++--
po/pa.po | 3504 +++--
po/pl.po | 5147 +++----
po/pt.po | 4591 +++---
po/pt_BR.po | 3772 +++--
po/ro.po | 3906 +++--
po/ru.po | 4720 +++---
po/sk.po | 4680 +++---
po/sv.po | 3728 ++---
po/th.po | 4530 +++---
po/tl.po | 3602 +++--
po/vi.po | 3853 +++--
po/zh_CN.po | 3843 +++--
po/zh_TW.po | 6533 ++++-----
run-script | 13 +
scripts/Dpkg/Arch.pm | 93 +-
scripts/Dpkg/BuildEnv.pm | 105 +
scripts/Dpkg/BuildFlags.pm | 149 +-
scripts/Dpkg/BuildOptions.pm | 5 +-
scripts/Dpkg/Changelog/Debian.pm | 2 +-
scripts/Dpkg/Changelog/Entry/Debian.pm | 12 +-
scripts/Dpkg/Control/Fields.pm | 35 +-
scripts/Dpkg/Control/Hash.pm | 30 +-
scripts/Dpkg/Control/Info.pm | 2 +-
scripts/Dpkg/Deps.pm | 205 +-
scripts/Dpkg/File.pm | 52 +
scripts/Dpkg/{Vars.pm => Package.pm} | 33 +-
scripts/Dpkg/Shlibs.pm | 11 +-
scripts/Dpkg/Shlibs/SymbolFile.pm | 6 +-
scripts/Dpkg/Source/Functions.pm | 1 +
scripts/Dpkg/Source/Package.pm | 20 +-
scripts/Dpkg/Source/Package/V2.pm | 187 +-
scripts/Dpkg/Source/Package/V3/bzr.pm | 3 +-
scripts/Dpkg/Source/Package/V3/git.pm | 6 +-
scripts/Dpkg/Source/Package/V3/quilt.pm | 270 +-
scripts/Dpkg/Source/Patch.pm | 9 +-
scripts/Dpkg/Source/Quilt.pm | 308 +
scripts/Dpkg/Substvars.pm | 64 +-
scripts/Dpkg/Vars.pm | 16 +-
scripts/Dpkg/Vendor.pm | 10 +-
scripts/Dpkg/Vendor/Debian.pm | 75 +-
scripts/Dpkg/Vendor/Ubuntu.pm | 3 +-
scripts/Dpkg/Version.pm | 7 +-
scripts/Makefile.am | 68 +-
scripts/changelog/debian.pl | 13 +-
scripts/dpkg-architecture.pl | 198 +-
scripts/dpkg-buildflags.pl | 76 +-
scripts/dpkg-buildpackage.pl | 193 +-
scripts/dpkg-checkbuilddeps.pl | 53 +-
scripts/dpkg-distaddfile.pl | 23 +-
scripts/dpkg-genchanges.pl | 41 +-
scripts/dpkg-gencontrol.pl | 101 +-
scripts/dpkg-gensymbols.pl | 57 +-
scripts/dpkg-maintscript-helper.sh | 19 +-
scripts/dpkg-mergechangelogs.pl | 17 +-
scripts/dpkg-name.pl | 6 +-
scripts/dpkg-parsechangelog.pl | 32 +-
scripts/dpkg-scanpackages.pl | 18 +-
scripts/dpkg-scansources.pl | 8 +-
scripts/dpkg-shlibdeps.pl | 82 +-
scripts/dpkg-source.pl | 44 +-
scripts/dpkg-vendor.pl | 18 +-
scripts/mk/architecture.mk | 25 +-
scripts/po/POTFILES.in | 3 +
scripts/po/ca.po | 1593 +-
scripts/po/de.po | 1972 +--
scripts/po/dpkg-dev.pot | 1366 +-
scripts/po/es.po | 2350 ++-
scripts/po/fr.po | 2150 +--
scripts/po/pl.po | 2478 ++--
scripts/po/ru.po | 2402 +--
scripts/po/sv.po | 1967 +--
scripts/t/150_Dpkg_Package.t | 29 +
scripts/t/200_Dpkg_Shlibs.t | 19 +-
scripts/t/200_Dpkg_Shlibs/objdump.basictags-amd64 | 72 +
scripts/t/200_Dpkg_Shlibs/objdump.basictags-i386 | 73 +
scripts/t/200_Dpkg_Shlibs/objdump.ls | 1 -
scripts/t/200_Dpkg_Shlibs/objdump.patterns | 228 +
scripts/t/200_Dpkg_Shlibs/objdump.space | 8 +
scripts/t/200_Dpkg_Shlibs/patterns.cpp | 20 +-
scripts/t/400_Dpkg_Deps.t | 24 +-
scripts/t/750_Dpkg_Substvars.t | 12 +-
scripts/t/910_merge_changelogs.t | 7 +-
scripts/t/910_merge_changelogs/ch-badver-a | 5 +
scripts/t/910_merge_changelogs/ch-badver-b | 11 +
scripts/t/910_merge_changelogs/ch-badver-merged | 11 +
scripts/t/910_merge_changelogs/ch-badver-old | 5 +
src/Makefile.am | 30 +-
src/archives.c | 678 +-
src/archives.h | 6 +-
src/cleanup.c | 64 +-
src/configure.c | 215 +-
src/depcon.c | 360 +-
src/divertcmd.c | 201 +-
src/divertdb.c | 5 +-
src/enquiry.c | 206 +-
src/errors.c | 16 +-
src/{infodb.h => file-match.c} | 33 +-
src/{infodb.h => file-match.h} | 25 +-
src/filesdb-hash.c | 73 +
src/filesdb.c | 225 +-
src/filesdb.h | 85 +-
src/filters.c | 6 +-
src/help.c | 380 +-
src/{infodb.c => infodb-access.c} | 25 +-
src/infodb-format.c | 151 +
src/infodb-upgrade.c | 252 +
src/infodb.h | 21 +-
src/main.c | 154 +-
src/main.h | 55 +-
src/packages.c | 152 +-
src/processarc.c | 413 +-
src/querycmd.c | 331 +-
src/remove.c | 222 +-
src/script.c | 340 +
src/select.c | 54 +-
src/statcmd.c | 73 +-
src/statdb.c | 22 +-
src/t/100_dpkg_divert.t | 67 +-
src/trigcmd.c | 57 +-
src/trigproc.c | 118 +-
src/update.c | 9 +-
triplettable | 2 +
utils/Makefile.am | 14 +-
utils/start-stop-daemon.c | 247 +-
utils/t/100_update_alternatives.t | 105 +-
utils/update-alternatives.c | 610 +-
426 files changed, 163066 insertions(+), 135537 deletions(-)
diff --cc debian/changelog
index 4b9c20e,c05df46..c35ca9a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,576 +1,585 @@@
+ dpkg (1.16.9) unstable; urgency=low
+
+ [ Raphaël Hertzog ]
+ * Fix dpkg-source regression in "3.0 (quilt)" source packages while
+ unapplying patches that remove all files in a directory. Closes: #683547
+ * Fix segfault in field format parsing on empty strings, affecting
+ «dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». LP: #1035512
+ * Fix dpkg's French usage string which was missing the final “s“ in
+ --print-foreign-architectures. Closes: #685863
+
+ [ Guillem Jover ]
+ * Use “statoverrides” instead of “statusoverrides” in dpkg-statoverride.
+ Closes: #686995
+ * Comment out dpkg(1) documentation about disabled --command-fd option.
+ Closes: #685677
+ * Cleanup dpkg-divert unit-test environment to avoid build failures.
+ Closes: #687656
+ * Fix update-alternatives test suite to behave correctly on non-Debian
+ binary paths. Known to be affecting at least Gentoo and Mac OS X.
+ * Do not leak subcall command arguments in update-alternatives.
+ * Fix segfault on update-alternatives when passing --slave without any
+ action at all. LP: #1037431
+ * Fix memory leak in dpkg filesavespackage().
+ * Do not print garbage (or worse) on dpkg shared conffile debug output.
+ * Use a hash instead of a ref to a hash for keys() in Dpkg::BuildFlags
+ get_feature_areas(). This causes compilation failures with older perl
+ versions, which can be an issue with partial upgrades.
+ * Fix filter subpattern debug output format string to print an actual
+ value instead of just blanks.
+ * Ignore trailing filter subpattern slashes on reinclusion comparison.
+ This makes sure to reinclude directories previously excluded so that
+ contained files marked for inclusion do not fail to unpack due to a
+ missing directory. Closes: #688416
+ * Do not consider obsolete conffiles as actively owned by the package.
+ This ensures conffile entries are not misshandled nor mixed up when
+ configuring packages owning the non-obsolete conffiles. Closes: #689836
+ Based on a patch by Andreas Beckmann <debian at abeckmann.de>.
+ * Properly mark in the database obsolete conffiles on package replaces.
+ * Sync the Conffiles field values for all package instances. Because
+ only the first package instance being configured will have a *.dpkg-new
+ conffile available to be processed, the subsequent ones need to use the
+ hash from the previously processed entries.
+ * Fix logic for previously configured conffiles, so that the shared
+ conffile checks actually work on reinstallation. Closes: #684776
+ * Avoid info database corruption and bogus accesses on unknown format
+ values, by always reading the format file and validating it.
+ * Clarify that the most probable reason for multiarch database
+ inconcistencies is due to upgrades from unofficial dpkg versions.
+ * Only satisfy a dependency on a “Multi-Arch: foreign” if arch-unqualified.
+ * Take architecture into account in virtual packages on remove and
+ configure dpkg actions. Closes: #683411
+ * Update update-alternatives --query format and examples in man page to
+ match the implementation.
+ * Add two missing 3rd person ‘s’ in dpkg-gensymbols(1). Closes: #689863
+ Thanks to Paul Menzel <pm.debian at googlemail.com>.
+ * Fix regression on old-style binNMUs for packages that specify an
+ explicit binary version to dpkg-gencontrol, by always fixing up the
+ source version. Closes: #690823
+
+ [ Updated programs translations ]
+ * Catalan (Guillem Jover).
+ * Czech (Miroslav Kure).
+ * Danish (Joe Dalton). Closes: #690808
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+ * Italian (Milo Casagrande).
+ * Japanese (Kenshi Muto).
+ * Polish (Michał Kułach). Closes: #690449
+ * Portuguese (Miguel Figueiredo). Closes: #682582, #690431
+ * Russian (Yuri Kozlov). Closes: #688050, #690415
+ * Slovak (Ivan Masár). Closes: #690426
+ * Swedish (Peter Krefting).
+ * Thai (Theppitak Karoonboonyanan). Closes: #690678
+ * Traditional Chinese (imacat). Closes: #687002
+
+ [ Updated scripts translations ]
+ * Polish (Michał Kułach). Closes: #683104
+ * Spanish (Omar Campagne). Closes: #685297
+
+ [ Updated dselect translations ]
+ * Basque (Iñaki Larrañaga Murgoitio). Closes: #686421
+ * Czech (Miroslav Kure).
+ * Danish (Joe Dalton). Closes: #689820
+ * Polish (Michał Kułach).
+
+ [ Updated man page translations ]
+ * French (Thomas Vincent, Sylvestre Ledru, Christian Perrier).
+ Closes: #682978, #683221
+ * German (Helge Kreutzmann).
+ * Japanese (Hideki Yamane). Closes: #685103
+ * Polish (Michał Kułach).
+ * Spanish (Omar Campagne, Guillem Jover). Closes: #683514
+ * Swedish (Peter Krefting).
+
+ -- Guillem Jover <guillem at debian.org> Sat, 20 Oct 2012 05:59:50 +0200
+
+ dpkg (1.16.8) unstable; urgency=low
+
+ [ Updated programs translations ]
+ * Esperanto (Felipe Castro).
+ * French (Christian Perrier).
+ * Polish (Michał Kułach). Closes: #680561
+ * Russian (Yuri Kozlov). Closes: #677850, #680411
+ * Slovak (Ivan Masár).
+ * Spanish (Javier Fernández-Sanguino)
+
+ [ Updated man page translations ]
+ * French (Christian Perrier).
+
+ [ Updated scripts translations ]
+ * French (Christian Perrier).
+ * Russian (Yuri Kozlov).
+
+ [ Updated dselect translations ]
+ * Danish (Joe Dalton). Closes: #680108
+ * Russian (Yuri Kozlov).
+ * Traditional Chinese (Asho Yeh - 阿信).
+
+ -- Guillem Jover <guillem at debian.org> Sat, 21 Jul 2012 02:11:04 +0200
+
+ dpkg (1.16.7) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Fix bogus dpkg-query --control-show badusage() strings.
+
+ [ Raphaël Hertzog ]
+ * Fix dpkg-gencontrol to correctly compute the source version
+ in the case of "old-style" bin-nmus. Closes: #679959
+
+ [ Updated dselect translations ]
+ * Catalan (Guillem Jover).
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+ * Swedish (Peter Krefting).
+
+ [ Updated programs translations ]
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+ * Italian (Milo Casagrande).
+ * Swedish (Peter Krefting).
+
+ [ Updated man page translations ]
+ * Swedish (Peter Krefting).
+ * French (Christian Perrier).
+
+ [ Updated scripts translations ]
+ * Swedish (Peter Krefting).
+ * French (Christian Perrier).
+
+ -- Raphaël Hertzog <hertzog at debian.org> Mon, 02 Jul 2012 21:16:12 +0200
+
+ dpkg (1.16.6) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Do not translate SE Linux context to human readable form while unpacking,
+ as that might cause the operation to fail if the mcstransd daemon
+ stopped running during the transaction. Closes: #679641
+ Thanks to Russell Coker <russell at coker.com.au>.
+ * Add --control-list and --control-show to dpkg-query --help output.
+
+ [ Raphaël Hertzog ]
+ * Fix import of error functions in dpkg-buildflags. Regression introduced
+ in 1.16.5.
+
+ [ Updated scripts translations ]
+ * German (Helge Kreutzmann).
+
+ [ Updated man page translations ]
+ * German (Helge Kreutzmann).
+
+ -- Guillem Jover <guillem at debian.org> Sat, 30 Jun 2012 21:45:10 +0200
+
+ dpkg (1.16.5) unstable; urgency=low
+
+ [ Raphaël Hertzog ]
+ * dpkg-source will now clean up after a failed application of a quilt
+ patch. Closes: #652970
+ And it will display a message explaining the most likely cause of
+ failure (patch applying with fuzz).
+ * When dpkg-source regenerates the automatic patch (with formats "2.0"
+ or "3.0 (quilt)") it will keep the current patch header to avoid
+ losing changes made by the maintainer.
+ * Modify dpkg-source --commit to auto-whitelist modified binary files.
+ That way the same command can be used whatever kind of upstream files
+ has been modified.
+ * dpkg-source now supports a new option --no-unapply-patches to force
+ patches to be kept applied after build (used by formats "2.0" and "3.0
+ (quilt)"). Closes: #643043
+
+ [ Guillem Jover ]
+ * Add a dpkg-buildflags --status action to describe the flag settings.
+ Thanks to Bernhard R. Link <brlink at debian.org>. Closes: #664058
+ * Add support for “binary-only” key-value option in changelogs, to allow
+ marking changelog entries as part of a binary only upload, having a
+ different version from the source package. Closes: #440094, #672723
+ * Minimize source architecture list on «dpkg-source -b» by removing
+ architectures already covered by architecture wildcards. Closes: #675333
+ * Do not assume $ENV{'HOME'} is defined in Dpkg::Source::Package.
+ Thanks to Niels Thykier <niels at thykier.net>. Closes: #677631
+ * Document in more detail in deb(5) the supported ar archive format.
+ * Document in deb-src-control(5) the “Private-” field prefix.
+ * Add new start-stop-daemon --no-close option to disable closing file
+ descriptors on --background. Closes: #627333, #646425
+ * Switch source compression to xz.
+ * Detect ar header fields truncation due to too long member names or too
+ large member sizes. Closes: #678933
+ * Add new dpkg-query --control-list and --control-show commands, which
+ replace the now deprecated --control-path.
+ * Print master and slave alternarive link names in update-alternatives
+ --query and always print alternative link in --config. Closes: #679010
+ * Cleanup and clarify buffer I/O error reporting. Closes: #621763
+ * Avoid full stop and double newline at the end of errors and warnings.
+ Thanks to Jonathan Nieder <jnieder at gmail.com>. Closes: #624000
+ * Change all programs to accept -? instead of -h for help output.
+ * Add support for specific arch-qualified dependencies. Closes: #676232
+ Thanks to Thibaut Girka <thib at sitedethib.com>.
+ * Accept “:native” arch-qualified Build-Dependencies. Closes: #558095
+ Thanks to Thibaut Girka <thib at sitedethib.com>.
+ * Do not use undefined values returned form deps_parse() in dpkg-shlibdeps.
+ Closes: #640676
+ * Add an Architecture column to «dpkg-query -l» before the Description
+ column. Suggested by Jonathan Nieder <jnieder at gmail.com>. Closes: #673190
+
+ [ Updated dpkg translations ]
+ * Swedish (Peter Krefting).
+
+ [ Updated dselect translations ]
+ * Swedish (Peter Krefting).
+
+ [ Updated scripts translations ]
+ * German (Helge Kreutzmann).
+
+ [ Updated man page translations ]
+ * German (Helge Kreutzmann).
+ * Swedish (Peter Krefting).
+
+ -- Guillem Jover <guillem at debian.org> Sat, 30 Jun 2012 04:28:51 +0200
+
+ dpkg (1.16.4.3) unstable; urgency=low
+
+ * On «update-alternatives --install» only warn for now on out of range
+ priorities and clamp the values, as there seems to be packages using
+ priorities > INT_MAX, which although bogus as they were previously
+ overflowing the int used to store them, that would cause installation
+ failures when upgrading from squeeze. This will be reverted to an
+ error after wheezy. Closes: #676874
+
+ -- Guillem Jover <guillem at debian.org> Sun, 17 Jun 2012 10:56:15 +0200
+
+ dpkg (1.16.4.2) unstable; urgency=low
+
+ * Check correctly for out of range negative field width values in dpkg-query
+ --show format strings. Regression introduced in 1.16.4. Closes: #676796
+
+ -- Guillem Jover <guillem at debian.org> Sat, 09 Jun 2012 16:16:17 +0200
+
+ dpkg (1.16.4.1) unstable; urgency=low
+
+ * Fix explicit file trigger activation. Regression introduced in 1.16.4.
+ Closes: #676684
+
+ -- Guillem Jover <guillem at debian.org> Fri, 08 Jun 2012 23:17:11 +0200
+
+ dpkg (1.16.4) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Deprecate compressing .deb files with lzma, by making dpkg-deb issue a
+ warning, as the format has several deficiencies that have been addressed
+ by upstream in xz. Although unpacking will be kept being supported to
+ handle existing lzma compressed .deb files.
+ * Add alternative changelog formats documentation from the policy manual
+ to dpkg-parsechangelog(1). Closes: #584141
+ * Add MiNT support to ostable and triplettable.
+ Requested by Thorsten Glaser <tg at mirbsd.de>.
+ * Add new frontend.txt file to dpkg-dev documenting some public interfaces
+ for dpkg frontends. Closes: #670897
+ * Clarify in dpkg(1) when --force-conf* options cause action.
+ Suggested by Sven Joachim <svenjoac at gmx.de>. Closes: #391818
+ * Add “gcc | c-compiler” to libdpkg-perl Suggests, due to Dpkg::Arch usage.
+ Closes: #671198
+ * Do not mask PIE from dpkg-buildflags on m68k, it appears to work now.
+ Requested by Thorsten Glaser <tg at mirbsd.de>.
+ * Remove deprecated support for PGP style signing command interface from
+ dpkg-buildpackage.
+ * Remove obsolete --udeb dpkg-scanpackages option.
+ * Add arm64 support to cputable. Closes: #672408
+ Thanks Wookey <wookey at wookware.org>.
+ * Check parsed integers for invalid or no digit errors in start-stop-daemon
+ and update-alternatives.
+ * Check all parsed integers for out of range errors; i.e. that no negative
+ values are allowed if not appropriate, and that no overflows occur.
+ Closes: #580038
+ * Switch start-stop-daemon(8) man page examples from /var/run to /run.
+ * Do not obscure Dpkg::Source::Package ‘require’ errors with custom
+ error message. Thanks to Thomas Adam <thomas.adam at smoothwall.net> and
+ Jonathan Nieder <jrnieder at gmail.com>.
+ * Add new Dpkg::Substvars::set_as_used() member function.
+ * Rename Dpkg::Substvars no_warn() member function to mark_as_used(), keep
+ the old name aliased to the new one producing a deprecation warning.
+ * Add support for Build-Depends-Arch and Build-Conflicts-Arch fields, and
+ a new -A option to dpkg-checkbuilddeps. Closes: #629480
+ Thanks to Roger Leigh <rleigh at debian.org>.
+ * Add support for “none” as a valid dpkg-deb compression strategy value.
+ Closes: #674711
+ * Clarify in dpkg(1) that the «dpkg -l» example only lists installed
+ packages, and that to list available packages «dpkg-query --load-avail»
+ has to be used instead. Closes: #673305
+ * Clarify also in the dpkg(1) man page (already present in the dpkg.cfg(5)
+ man page) the valid filenames for /etc/dpkg/dpkg.cfg.d/ fragment files.
+ Closes: #674674
+ * Fix start-stop-daemon to not follow symlinks when creating pidfiles.
+ Thanks to Carsten Hey <carsten at debian.org>. Closes: #675918
+ * Refactor the file locking logic into a new Dpkg::File module, and move
+ the libfile-fcntllock-perl dependency from dpkg-dev to libdpkg-perl.
+ * Demote the libfile-fcntllock-perl Depends to a Recommends by falling back
+ to use flock based locking, because it being an XS module makes building
+ a new perl package bumping the perl ABI impossible, as both packages
+ become uninstallable. Thanks to Dominic Hargreaves <dom at earth.li>.
+ Closes: #675947
+ * Put an & before field_capitalize() calls in Dpkg::Control::Fields to
+ fix a usage before declaration warning with perl 5.16. Closes: #676262
+ * Do not warn in dpkg-divert on missing files list file for packages never
+ installed before. Closes: #673518
+ * Add support for liblzma to handle .xz and .lzma compressed files, and
+ switch to it instead of using xz-utils. This removes the xz-utils
+ Pre-Depends from dpkg. Thanks to Jonathan Nieder <jrnieder at gmail.com>.
+ * Always activate all path components for file triggers, this fixes file
+ trigger handling for conffiles and dpkg-trigger invocations.
+ Closes: #675613, #676061, #676062, #676107, #676118, #676122
+ * Do not reset Multi-Arch field in the update log when removing the package.
+ Closes: #676496
+ * Fix dpkg-split to honour the DPKG_ADMINDIR environment variable.
+
+ [ Updated man page translations ]
+ * German (Helge Kreutzmann).
+ * French (Christian Perrier). Fixes a mistranslation and some
+ inconsistencies reported by Vincent Danjean( thanks). Closes: #673158
+
+ -- Guillem Jover <guillem at debian.org> Thu, 07 Jun 2012 23:43:19 +0200
+
+ dpkg (1.16.3) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Do not look for newline beyond the read buffer on dpkg-deb extract.
+ * Check update-alternative name and link arguments for all commands.
+ Closes: #665050
+ * Check all dpkg-divert filename arguments to be absolute and to not
+ contain newlines. Closes: #21722
+ * Print errors while reading the file list files on a new line instead
+ of just after the progress percentage. Closes: #552517
+ * Document in dpkg-source(1) that patches for source format “3.0 (quilt)”
+ are expected to apply without any fuzz. Closes: #666752
+ Based on a patch by Luca Capello <luca at pca.it>.
+ * Remove redundant -Wformat-security from default dpkg-buildflags, which
+ is already implied by -Werror=format-security. Closes: #664964
+ Suggested by Peter Eisentraut <petere at debian.org>.
+ * Document in dpkg-query(1) that commands producing multiple paragraphs
+ will preserve the order of the packages specified on the argument list.
+ * Change start-stop-daemon --exec on GNU/Hurd, FreeBSD, NetBSD, OpenBSD
+ and Solaris to check for executables matching device and inode numbers
+ instead of filenames.
+ * Change start-stop-daemon --name on GNU/Hurd to check the process' argv[1]
+ in addition to argv[0], to handle both binaries and interpreted scripts.
+ Reported by Mats Erik Andersson <mats.andersson at gisladisker.se>.
+ * Handle deb format versions as major.minor integers instead of strings or
+ floats, the latter being susceptible to parsing errors depending on the
+ current locale (although this was only affecting the old deb format).
+ * Ignore the minor format version number for deb-split format, unifying
+ the behaviour with the deb format.
+ * Add support for an abitable containing arch attribute overrides.
+ * Add x32 support to abitable, ostable and triplettable. Closes: #667037
+ * Fix start-stop-daemon to work with relative --exec arguments and --chdir.
+ Closes: #669047
+ * Ignore request to rename a file owned by the diverting package on
+ «dpkg-divert --add --rename». Closes: #588077
+ * Clarify dpkg-gensymbols(1) by way of examples that architecture wildcards
+ are supported in symbols files. Closes: #670048
+ * Fix memory leak due to Dpkg::Control objects not being garbage-collected.
+ Thanks to Ben Harris <bjh21 at cam.ac.uk>. Closes: #669012
+ * Compute the md5sum hash on unpack for empty files too, so that these
+ can be checked correctly for matching content when installing multiple
+ package instances.
+ * Generate md5sums files automatically at unpack time if missing from the
+ binary package. Closes: #155676, #155799
+ * Add missing list and md5sums database file checks to «dpkg --audit».
+
+ [ Helge Kreutzmann ]
+ * Fix a typo in man/dpkg-buildflags.1.
+
+ [ Updated dpkg translations ]
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+ * Swedish (Peter Krefting).
+
+ [ Updated dselect translations ]
+ * French (Christian Perrier).
+ * German (Sven Joachim).
+ * Swedish (Peter Krefting).
+
+ [ Updated scripts translations ]
+ * French (Christian Perrier).
+ * Swedish (Peter Krefting).
+
+ [ Updated man translations ]
+ * French (Christian Perrier).
+ * German (Helge Kreutzmann).
+ * Swedish (Peter Krefting).
+
+ -- Guillem Jover <guillem at debian.org> Fri, 27 Apr 2012 10:10:10 +0200
+
+ dpkg (1.16.2) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Move <config.h> and <compat.h> to the top of trigdeferred.l to properly
+ use the configured features and compat code.
+ * Honour --disable-nls when the system lacks obstack support, by updating
+ the obstack compat module from gnulib.
+ * Link the libdpkg unit tests with libcompat and libintl, so that systems
+ needing them will compile correctly.
+ * Check for the presence of the strnlen declaration and correctly provide
+ the compat one in case the systems lacks it.
+ * Do not assume existence of paths on the build system in the test suite.
+ * Do not fail to link dselect on MacOS X when using --disable-nls.
+ * Remove versioned coreutils Pre-Depends from dpkg due to the ancient
+ md5sum transition. Reported by Bill Allombert <ballombe at debian.org>.
+ Closes: #643746
+ * Change dpkg-architecture to only compute the requested variables. This:
+ - Fixes the bootstrapping problem, as the dpkg build system only needs
+ the host architecture, for which dpkg itself is not required.
+ - Reduces the amount of work performed, including loading and parsing
+ unnecessary table files or calling either of gcc or dpkg programs.
+ * Improve error message in dpkg-gencontrol and dpkg-gensymbols when
+ debian/control does not have any package stanza. Closes: #642473
+ Based on a patch by Kyle Willmon <kylewillmon at gmail.com>.
+ * Add Pre-Depends on tar >= 1.23 (satisfied in stable) to dpkg due to it
+ using the ‘--warning=no-timestamp’ option. Closes: #642802
+ * Do not segfault on GNU/Linux when dpkg cannot retrieve the block size
+ for the filesystem containing the info database. LP: #872734
+ * Fix two memory leaks per tar entry in the tar extractor used on unpack.
+ * Mark dpkg and dselect as Multi-Arch foreign.
+ Reported by Steve Langasek <vorlon at debian.org>.
+ * Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
+ Thanks to Colin Watson <cjwatson at ubuntu.com>.
+ * Add new deb-origin.5 man page. Closes: #608884
+ Thanks to Matt Kraai <kraai at ftbfs.org>.
+ * Return correct status on start-stop-daemon --status when using --pidfile.
+ * Treat dpkg-deb compression level independently for each backend. This
+ has the effect of changing the current behaviour for level 0 on all
+ compressors except gzip.
+ * Add new dpkg-deb -S option to specify the compression strategy. The only
+ currently supported value is “extreme” for xz. Closes: #647915
+ * Stop using brace expansion to install man pages by using dh_installman
+ instead of dh_install, the former does not abort on empty glob expansion.
+ * Do not use absolute paths for programs in perl and shell code.
+ * Add missing ‘*’ in asprintf() and vasprintf() compat declarations.
+ * Add support for virtual output binary:Summary and db:Status-Abbrev fields.
+ Closes: #192619, #427945
+ * Add support for virtual output source:Package and source:Version fields.
+ Closes: #653575
+ * Use a different temporary file per process on libcompat's vsnprintf()
+ function to avoid race conditions from children after fork(3).
+ Reported by Daniel Ruoso <daniel at ruoso.com>. Closes: #655411
+ * Fix start-stop-daemon --exec and --name options on FreeBSD, NetBSD and
+ OpenBSD by swapping the process matching implementations.
+ * Fix start-stop-daemon --name option on GNU/Hurd to match the process name.
+ * Document in more detail the implications of start-stop-daemon matching
+ options. Closes: #367608
+ * Improve and clarify dpkg-shlibdeps superfluous linking warning messages.
+ Based on a patch by Peter Eisentraut <petere at debian.org>. Closes: #656496
+ * Relax --merge-avail Packages file parser, to not fail on bogus versions.
+ * When building only arch-indep binaries with «dpkg-buildpackage -A», name
+ the .changes file using ‘all’ as architecture. Closes: #661638
+ * Handle unknown architectures gracefully in dpkg-buildflags.
+ Closes: #663004
+ * Add missing --status-logger to dpkg --help output.
+ * Do not print bogus errno string for invalid package names in dpkg
+ --ignore-depends option.
+ * Change dpkg-query to not load the available file by default for --list
+ and --show, add a new --load-avail option to expose the old behaviour.
+ * Only allow setting selections via «dpkg --set-selections» for known
+ packages (i.e. those present in either the status or available files).
+ * Always ignore older versions when parsing the available file, not only
+ for --update-avail and --merge-avail.
+ * Mark not-installed non-arch-qualified selections for removal.
+ * Add new «dpkg --assert-multi-arch» command to allow checking for
+ multi-arch support availability.
+ * Bump Standards-Version to 3.9.3 (no changes needed).
+ * Add architecture consistency checks to «dpkg --audit».
+ * Add new dpkg --add-architecture and --remove-architecture commands to
+ track supported architectures.
+
+ [ Raphaël Hertzog ]
+ * Update Dpkg::Shlibs to look into multiarch paths when cross-building
+ too. Closes: #595144
+ * Rewrite architecture.mk with explicit loops instead of duplicating many
+ similar lines. Based on a patch by Thorsten Glaser <tg at mirbsd.de>.
+ * Modify dpkg-gencontrol and dpkg-distaddfile to grab a write lock
+ on debian/control before updating debian/files to avoid simultaneous
+ updates. Closes: #642608
+ Add libfile-fcntllock-perl to dpkg-dev's Depends since we use this module
+ to handle the locking.
+ * Update dpkg-gensymbols(1) to clarify that -e accepts shell patterns
+ expansions and not regular expressions. And let dpkg-gensymbols output a
+ warning when a pattern doesn't match any file. Closes: #649248
+ * Add new option "-a <arch>" to dpkg-checkbuilddeps to check build
+ dependencies for another architecture. This is really basic for now since
+ it assumes all build dependencies must be satisfied on the listed
+ architecture. Closes: #648180 Thanks to Colin Watson for the patch.
+ * Error out if a dpkg database .list file is not a regular file. LP: #369898
+ * Fix dpkg-mergechangelogs to not error out on invalid versions.
+ Closes: #651993
+ * Fix dpkg-source --commit on "3.0 (quilt)" when an explicit patch file
+ is given with a relative filename. Closes: #652414
+ * Further clarify in dpkg-source(1) the conditions under which it's possible
+ to pass an explicit patch file to dpkg-source --commit.
+ * Add new --query-features command to dpkg-buildflags. Thanks to Kees Cook
+ for the patch. Closes: #651481
+ * 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.
+ * Update dpkg-buildpackage to use the "build-arch" (for -B) and
+ "build-indep" (for -A) targets unless "make -qn" says that they do not
+ exist. Closes: #229357
+ * Improve deb-shlibs(5) to mention that the dependency field must
+ use the same syntax as a Depends field. Closes: #658696
+ * Update dpkg-maintscript-helper(1) to recommend usage of the version
+ removing/renaming a conffile with a "~" suffix as "priorversion"
+ parameter. Thanks to Sam Morris <sam at robots.org.uk> for the patch.
+ Closes: #658854
+ * Fix debug output of dpkg-maintscript-helper. LP: #936340
+
+ [ Jonathan Nieder ]
+ * Bump po4a version in Build-Depends to 0.41, since earlier versions do
+ not handle --srcdir correctly. Closes: #644370
+
+ [ Guillem Jover, Steve Langasek, Raphaël Hertzog ]
+ * Add new dpkg --print-foreign-architectures command.
+ * Add support for virtual output binary:Package field.
+ * Implement Multi-Arch support.
+
+ [ Helge Kreutzmann ]
+ * Fix a typo in man/dpkg-deb.1.
+
+ [ Updated dpkg translations ]
+ * German (Sven Joachim).
+ * Italian (Milo Casagrande). Closes: #627832, #657849
+ * Swedish (Peter Krefting).
+ * French (Christian Perrier)
+ * Polish (Michał Kułach). Closes: #658126
+
+ [ Updated scripts translations ]
+ * German (Helge Kreutzmann).
+ * Spanish (Omar Campagne). Closes: #636238
+ * Swedish (Peter Krefting).
+
+ [ Updated man page translations ]
+ * German (Helge Kreutzmann), including typo fix in dpkg-genchanges
+ Closes: #646496, sub optimal translation of package states LP: #368783
+ and an fix by Chris Leick
+ * Japanese (TAKAHASHI Motonobu).
+ * Spanish (Omar Campagne). Closes: #643969
+ * Swedish (Peter Krefting).
+ * Minor errors corrected in French (thanks to David Prévot)
+ * Fix translation of -B and -A options of dpkg-buildpackage.
+ Thanks to Vincent Danjean. Closes: #654626
+
+ [ Updated dselect translations ]
+ * Dutch (Jeroen Schot). Closes: #651813
+
+ -- Guillem Jover <guillem at debian.org> Mon, 19 Mar 2012 07:27:12 +0100
+
+dpkg (1.16.1.2~bpo60+1) squeeze-backports; urgency=low
+
+ * Disable DEB_HOST_MULTIARCH / DEB_BUILD_MULTIARCH variables in
+ dpkg-architecture so that packages do not incorrectly enable multiarch in
+ squeeze-backports.
+ * Do the same for /usr/share/dpkg/architecture.mk.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Thu, 15 Mar 2012 08:27:03 +0100
+
dpkg (1.16.1.2) unstable; urgency=medium
[ Raphaël Hertzog ]
diff --cc debian/control
index 0c13a51,5abf4fa..d2988f1
--- a/debian/control
+++ b/debian/control
@@@ -8,10 -8,10 +8,10 @@@ Bugs: debbugs://bugs.debian.or
Homepage: http://wiki.debian.org/Teams/Dpkg
Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
Build-Depends: debhelper (>= 7), pkg-config, flex,
- gettext (>= 0.18), po4a (>= 0.41),
+ gettext (>= 0.18), po4a (>= 0.33.1),
- zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
+ zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, liblzma-dev,
libselinux1-dev (>= 1.28-4) [linux-any],
libncursesw5-dev,
libtimedate-perl, libio-string-perl
diff --cc debian/rules
index 8be1e01,b5e0d31..b1cf6c4
--- a/debian/rules
+++ b/debian/rules
@@@ -79,6 -84,40 +84,13 @@@ ifeq (yes,$(shell dpkg-vendor --derives
$(CURDIR)/debian/tmp/usr/share/dpkg/cputable
endif
+ define dpkg-installmanl10n
+ for f in `sed -e 's:\*:*/*:' debian/$(1).manpages`; do \
+ test -e $$f && \
+ install -D $$f `echo $$f | sed -e 's:^debian/tmp:debian/$(1):'`; \
+ done
+ endef
+
-# Put together the dpkg and dselect packages
-binary-arch: install
- dh_testdir -a
- dh_testroot -a
- dh_install --sourcedir=debian/tmp -a
- dh_installcron -a
- dh_installlogrotate -a
-
- install -d debian/dpkg/sbin
- mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
-
- dh_installchangelogs -a ChangeLog*
- dh_installdocs -a
- $(call dpkg-installmanl10n,dpkg)
- $(call dpkg-installmanl10n,dselect)
- dh_installman -a
- dh_link -a
- dh_lintian -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
# Put together the dpkg-dev package
binary-indep: install
dh_testdir -i
diff --cc man/po/po4a.cfg
index 034c90e,924f77c..75ec051
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@@ -13,125 -13,128 +13,128 @@@
opt_ru:"-L koi8-r -A utf-8" \
opt_sv:"-L ISO-8859-1 -A utf-8"
-[type:man] deb.5 $lang:$lang/deb.5 \
+[type:man] deb.5 $lang:$(builddir)/$lang/deb.5 \
add_$lang:po/$lang.add
-[type:man] deb-control.5 $lang:$lang/deb-control.5 \
+[type:man] deb-control.5 $lang:$(builddir)/$lang/deb-control.5 \
add_$lang:po/$lang.add
-[type:man] deb-src-control.5 $lang:$lang/deb-src-control.5 \
+[type:man] deb-src-control.5 $lang:$(builddir)/$lang/deb-src-control.5 \
add_$lang:po/$lang.add
-[type:man] deb-split.5 $lang:$lang/deb-split.5 \
+[type:man] deb-split.5 $lang:$(builddir)/$lang/deb-split.5 \
add_$lang:po/$lang.add
-[type:man] deb-version.5 $lang:$lang/deb-version.5 \
+[type:man] deb-version.5 $lang:$(builddir)/$lang/deb-version.5 \
add_$lang:po/$lang.add
-[type:man] deb-old.5 $lang:$lang/deb-old.5 \
+[type:man] deb-old.5 $lang:$(builddir)/$lang/deb-old.5 \
add_$lang:po/$lang.add
-[type:man] deb-origin.5 $lang:$lang/deb-origin.5 \
++[type:man] deb-origin.5 $lang:$(builddir)/$lang/deb-origin.5 \
+ add_$lang:po/$lang.add
+
-[type:man] deb-override.5 $lang:$lang/deb-override.5 \
+[type:man] deb-override.5 $lang:$(builddir)/$lang/deb-override.5 \
add_$lang:po/$lang.add
-[type:man] deb-extra-override.5 $lang:$lang/deb-extra-override.5 \
+[type:man] deb-extra-override.5 $lang:$(builddir)/$lang/deb-extra-override.5 \
add_$lang:po/$lang.add
-[type:man] deb-shlibs.5 $lang:$lang/deb-shlibs.5 \
+[type:man] deb-shlibs.5 $lang:$(builddir)/$lang/deb-shlibs.5 \
add_$lang:po/$lang.add
-[type:man] deb-substvars.5 $lang:$lang/deb-substvars.5 \
+[type:man] deb-substvars.5 $lang:$(builddir)/$lang/deb-substvars.5 \
add_$lang:po/$lang.add
-[type:man] deb-symbols.5 $lang:$lang/deb-symbols.5 \
+[type:man] deb-symbols.5 $lang:$(builddir)/$lang/deb-symbols.5 \
add_$lang:po/$lang.add
-[type:man] deb-triggers.5 $lang:$lang/deb-triggers.5 \
+[type:man] deb-triggers.5 $lang:$(builddir)/$lang/deb-triggers.5 \
add_$lang:po/$lang.add
-[type:man] dpkg.1 $lang:$lang/dpkg.1 \
+[type:man] dpkg.1 $lang:$(builddir)/$lang/dpkg.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-architecture.1 $lang:$lang/dpkg-architecture.1 \
+[type:man] dpkg-architecture.1 $lang:$(builddir)/$lang/dpkg-architecture.1 \
add_$lang:po/$lang.add
-[type:man] dpkg.cfg.5 $lang:$lang/dpkg.cfg.5 \
+[type:man] dpkg.cfg.5 $lang:$(builddir)/$lang/dpkg.cfg.5 \
add_$lang:po/$lang.add
-[type:man] dpkg-buildflags.1 $lang:$lang/dpkg-buildflags.1 \
+[type:man] dpkg-buildflags.1 $lang:$(builddir)/$lang/dpkg-buildflags.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-buildpackage.1 $lang:$lang/dpkg-buildpackage.1 \
+[type:man] dpkg-buildpackage.1 $lang:$(builddir)/$lang/dpkg-buildpackage.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-checkbuilddeps.1 $lang:$lang/dpkg-checkbuilddeps.1 \
+[type:man] dpkg-checkbuilddeps.1 $lang:$(builddir)/$lang/dpkg-checkbuilddeps.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-distaddfile.1 $lang:$lang/dpkg-distaddfile.1 \
+[type:man] dpkg-distaddfile.1 $lang:$(builddir)/$lang/dpkg-distaddfile.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-deb.1 $lang:$lang/dpkg-deb.1 \
+[type:man] dpkg-deb.1 $lang:$(builddir)/$lang/dpkg-deb.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-divert.8 $lang:$lang/dpkg-divert.8 \
+[type:man] dpkg-divert.8 $lang:$(builddir)/$lang/dpkg-divert.8 \
add_$lang:po/$lang.add
-[type:man] dpkg-genchanges.1 $lang:$lang/dpkg-genchanges.1 \
+[type:man] dpkg-genchanges.1 $lang:$(builddir)/$lang/dpkg-genchanges.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-gencontrol.1 $lang:$lang/dpkg-gencontrol.1 \
+[type:man] dpkg-gencontrol.1 $lang:$(builddir)/$lang/dpkg-gencontrol.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-gensymbols.1 $lang:$lang/dpkg-gensymbols.1 \
+[type:man] dpkg-gensymbols.1 $lang:$(builddir)/$lang/dpkg-gensymbols.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-maintscript-helper.1 $lang:$lang/dpkg-maintscript-helper.1 \
+[type:man] dpkg-maintscript-helper.1 $lang:$(builddir)/$lang/dpkg-maintscript-helper.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-mergechangelogs.1 $lang:$lang/dpkg-mergechangelogs.1 \
+[type:man] dpkg-mergechangelogs.1 $lang:$(builddir)/$lang/dpkg-mergechangelogs.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-name.1 $lang:$lang/dpkg-name.1 \
+[type:man] dpkg-name.1 $lang:$(builddir)/$lang/dpkg-name.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-parsechangelog.1 $lang:$lang/dpkg-parsechangelog.1 \
+[type:man] dpkg-parsechangelog.1 $lang:$(builddir)/$lang/dpkg-parsechangelog.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-query.1 $lang:$lang/dpkg-query.1 \
+[type:man] dpkg-query.1 $lang:$(builddir)/$lang/dpkg-query.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-scanpackages.1 $lang:$lang/dpkg-scanpackages.1 \
+[type:man] dpkg-scanpackages.1 $lang:$(builddir)/$lang/dpkg-scanpackages.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-scansources.1 $lang:$lang/dpkg-scansources.1 \
+[type:man] dpkg-scansources.1 $lang:$(builddir)/$lang/dpkg-scansources.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-shlibdeps.1 $lang:$lang/dpkg-shlibdeps.1 \
+[type:man] dpkg-shlibdeps.1 $lang:$(builddir)/$lang/dpkg-shlibdeps.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-source.1 $lang:$lang/dpkg-source.1 \
+[type:man] dpkg-source.1 $lang:$(builddir)/$lang/dpkg-source.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-split.1 $lang:$lang/dpkg-split.1 \
+[type:man] dpkg-split.1 $lang:$(builddir)/$lang/dpkg-split.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-statoverride.8 $lang:$lang/dpkg-statoverride.8 \
+[type:man] dpkg-statoverride.8 $lang:$(builddir)/$lang/dpkg-statoverride.8 \
add_$lang:po/$lang.add
-[type:man] dpkg-trigger.1 $lang:$lang/dpkg-trigger.1 \
+[type:man] dpkg-trigger.1 $lang:$(builddir)/$lang/dpkg-trigger.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-vendor.1 $lang:$lang/dpkg-vendor.1 \
+[type:man] dpkg-vendor.1 $lang:$(builddir)/$lang/dpkg-vendor.1 \
add_$lang:po/$lang.add
-[type:man] dselect.1 $lang:$lang/dselect.1 \
+[type:man] dselect.1 $lang:$(builddir)/$lang/dselect.1 \
add_$lang:po/$lang.add
-[type:man] dselect.cfg.5 $lang:$lang/dselect.cfg.5 \
+[type:man] dselect.cfg.5 $lang:$(builddir)/$lang/dselect.cfg.5 \
add_$lang:po/$lang.add
-[type:man] start-stop-daemon.8 $lang:$lang/start-stop-daemon.8 \
+[type:man] start-stop-daemon.8 $lang:$(builddir)/$lang/start-stop-daemon.8 \
add_$lang:po/$lang.add
-[type:man] update-alternatives.8 $lang:$lang/update-alternatives.8 \
+[type:man] update-alternatives.8 $lang:$(builddir)/$lang/update-alternatives.8 \
add_$lang:po/$lang.add
diff --cc scripts/dpkg-architecture.pl
index dc5bb4a,6ed7a72..a25d19f
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@@ -75,7 -72,41 +72,42 @@@ sub list_arches(
}
}
+ use constant {
+ DEB_NONE => 0,
+ DEB_BUILD => 1,
+ DEB_HOST => 2,
+ DEB_ARCH_INFO => 4,
+ DEB_ARCH_ATTR => 8,
+ DEB_MULTIARCH => 16,
+ DEB_GNU_INFO => 32,
+ };
++# Squeeze backport: we dropped/disabled DEB_MULTIARCH everywhere
+ use constant DEB_ALL => DEB_BUILD | DEB_HOST | DEB_ARCH_INFO | DEB_ARCH_ATTR |
- DEB_MULTIARCH | DEB_GNU_INFO;
++ DEB_GNU_INFO; # | DEB_MULTIARCH
+
+ my %arch_vars = (
+ "DEB_BUILD_ARCH" => DEB_BUILD,
+ "DEB_BUILD_ARCH_OS" => DEB_BUILD | DEB_ARCH_INFO,
+ "DEB_BUILD_ARCH_CPU" => DEB_BUILD | DEB_ARCH_INFO,
+ "DEB_BUILD_ARCH_BITS" => DEB_BUILD | DEB_ARCH_ATTR,
+ "DEB_BUILD_ARCH_ENDIAN" => DEB_BUILD | DEB_ARCH_ATTR,
- "DEB_BUILD_MULTIARCH" => DEB_BUILD | DEB_MULTIARCH,
++# "DEB_BUILD_MULTIARCH" => DEB_BUILD | DEB_MULTIARCH,
+ "DEB_BUILD_GNU_CPU" => DEB_BUILD | DEB_GNU_INFO,
+ "DEB_BUILD_GNU_SYSTEM" => DEB_BUILD | DEB_GNU_INFO,
+ "DEB_BUILD_GNU_TYPE" => DEB_BUILD | DEB_GNU_INFO,
+ "DEB_HOST_ARCH" => DEB_HOST,
+ "DEB_HOST_ARCH_OS" => DEB_HOST | DEB_ARCH_INFO,
+ "DEB_HOST_ARCH_CPU" => DEB_HOST | DEB_ARCH_INFO,
+ "DEB_HOST_ARCH_BITS" => DEB_HOST | DEB_ARCH_ATTR,
+ "DEB_HOST_ARCH_ENDIAN" => DEB_HOST | DEB_ARCH_ATTR,
- "DEB_HOST_MULTIARCH" => DEB_HOST | DEB_MULTIARCH,
++# "DEB_HOST_MULTIARCH" => DEB_HOST | DEB_MULTIARCH,
+ "DEB_HOST_GNU_CPU" => DEB_HOST | DEB_GNU_INFO,
+ "DEB_HOST_GNU_SYSTEM" => DEB_HOST | DEB_GNU_INFO,
+ "DEB_HOST_GNU_TYPE" => DEB_HOST | DEB_GNU_INFO,
+ );
+
+ my $req_vars = DEB_ALL;
my $req_host_arch = '';
my $req_host_gnu_type = '';
my $req_eq_arch = '';
@@@ -164,40 -219,41 +220,40 @@@ if ($req_host_gnu_type ne '' && $req_ho
if $dfl_host_gnu_type ne $req_host_gnu_type;
}
- if ($req_host_arch eq '') {
- $v{DEB_HOST_ARCH} = get_raw_host_arch();
- } else {
- $v{DEB_HOST_ARCH} = $req_host_arch;
- }
- if ($req_host_gnu_type eq '') {
- $v{DEB_HOST_GNU_TYPE} = debarch_to_gnutriplet($v{DEB_HOST_ARCH});
- } else {
- $v{DEB_HOST_GNU_TYPE} = $req_host_gnu_type;
- }
-
- my $gcc = get_gcc_host_gnu_type();
+ # Proceed to compute the host variables if needed.
- warning(_g("Specified GNU system type %s does not match gcc system type %s."),
- $v{DEB_HOST_GNU_TYPE}, $gcc)
- if !($req_is_arch or $req_eq_arch) &&
- ($gcc ne '') && ($gcc ne $v{DEB_HOST_GNU_TYPE});
+ if (action_needs(DEB_HOST)) {
+ if ($req_host_arch eq '') {
+ $v{DEB_HOST_ARCH} = get_raw_host_arch();
+ } else {
+ $v{DEB_HOST_ARCH} = $req_host_arch;
+ }
+ }
+ ($abi, $v{DEB_HOST_ARCH_OS}, $v{DEB_HOST_ARCH_CPU}) = debarch_to_debtriplet($v{DEB_HOST_ARCH})
+ if (action_needs(DEB_HOST | DEB_ARCH_INFO));
+ ($v{DEB_HOST_ARCH_BITS}, $v{DEB_HOST_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_HOST_ARCH})
+ if (action_needs(DEB_HOST | DEB_ARCH_ATTR));
- # Split the Debian and GNU names
- my $abi;
+ $v{DEB_HOST_MULTIARCH} = debarch_to_multiarch($v{DEB_HOST_ARCH})
+ if (action_needs(DEB_HOST | DEB_MULTIARCH));
- ($abi, $v{DEB_HOST_ARCH_OS}, $v{DEB_HOST_ARCH_CPU}) = debarch_to_debtriplet($v{DEB_HOST_ARCH});
- ($abi, $v{DEB_BUILD_ARCH_OS}, $v{DEB_BUILD_ARCH_CPU}) = debarch_to_debtriplet($v{DEB_BUILD_ARCH});
- ($v{DEB_HOST_GNU_CPU}, $v{DEB_HOST_GNU_SYSTEM}) = split(/-/, $v{DEB_HOST_GNU_TYPE}, 2);
- ($v{DEB_BUILD_GNU_CPU}, $v{DEB_BUILD_GNU_SYSTEM}) = split(/-/, $v{DEB_BUILD_GNU_TYPE}, 2);
+ if (action_needs(DEB_HOST | DEB_GNU_INFO)) {
+ if ($req_host_gnu_type eq '') {
+ $v{DEB_HOST_GNU_TYPE} = debarch_to_gnutriplet($v{DEB_HOST_ARCH});
+ } else {
+ $v{DEB_HOST_GNU_TYPE} = $req_host_gnu_type;
+ }
+ ($v{DEB_HOST_GNU_CPU}, $v{DEB_HOST_GNU_SYSTEM}) = split(/-/, $v{DEB_HOST_GNU_TYPE}, 2);
- ($v{DEB_HOST_ARCH_BITS}, $v{DEB_HOST_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_HOST_ARCH});
- ($v{DEB_BUILD_ARCH_BITS}, $v{DEB_BUILD_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_BUILD_ARCH});
+ my $gcc = get_gcc_host_gnu_type();
- # Disabled for squeeze-backports
- #$v{DEB_BUILD_MULTIARCH} = debarch_to_multiarch($v{DEB_BUILD_ARCH});
- #$v{DEB_HOST_MULTIARCH} = debarch_to_multiarch($v{DEB_HOST_ARCH});
+ warning(_g("specified GNU system type %s does not match gcc system " .
+ "type %s, try setting a correct CC environment variable"),
+ $v{DEB_HOST_GNU_TYPE}, $gcc)
+ if ($gcc ne '') && ($gcc ne $v{DEB_HOST_GNU_TYPE});
+ }
- for my $k (@ordered) {
-
+ for my $k (keys %arch_vars) {
$v{$k} = $ENV{$k} if (defined ($ENV{$k}) && !$force);
}
diff --cc scripts/mk/architecture.mk
index b0661ed,31549ac..b42d8eb
--- a/scripts/mk/architecture.mk
+++ b/scripts/mk/architecture.mk
@@@ -4,24 -4,8 +4,9 @@@
dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
- DEB_HOST_ARCH ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture -qDEB_HOST_ARCH)
- DEB_HOST_ARCH_OS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_OS,dpkg-architecture -qDEB_HOST_ARCH_OS)
- DEB_HOST_ARCH_CPU ?= $(call dpkg_late_eval,DEB_HOST_ARCH_CPU,dpkg-architecture -qDEB_HOST_ARCH_CPU)
- DEB_HOST_ARCH_BITS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_BITS,dpkg-architecture -qDEB_HOST_ARCH_BITS)
- DEB_HOST_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_HOST_ARCH_ENDIAN,dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
- DEB_HOST_GNU_CPU ?= $(call dpkg_late_eval,DEB_HOST_GNU_CPU,dpkg-architecture -qDEB_HOST_GNU_CPU)
- DEB_HOST_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_HOST_GNU_SYSTEM,dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
- DEB_HOST_GNU_TYPE ?= $(call dpkg_late_eval,DEB_HOST_GNU_TYPE,dpkg-architecture -qDEB_HOST_GNU_TYPE)
- # Disabled for squeeze-backports
- #DEB_HOST_MULTIARCH ?= $(call dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture -qDEB_HOST_MULTIARCH)
+ dpkg_architecture_setvar = $(1) ?= $(call dpkg_late_eval,$(1),dpkg-architecture -q$(1))
- DEB_BUILD_ARCH ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture -qDEB_BUILD_ARCH)
- DEB_BUILD_ARCH_OS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_OS,dpkg-architecture -qDEB_BUILD_ARCH_OS)
- DEB_BUILD_ARCH_CPU ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_CPU,dpkg-architecture -qDEB_BUILD_ARCH_CPU)
- DEB_BUILD_ARCH_BITS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_BITS,dpkg-architecture -qDEB_BUILD_ARCH_BITS)
- DEB_BUILD_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_ENDIAN,dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
- DEB_BUILD_GNU_CPU ?= $(call dpkg_late_eval,DEB_BUILD_GNU_CPU,dpkg-architecture -qDEB_BUILD_GNU_CPU)
- DEB_BUILD_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_BUILD_GNU_SYSTEM,dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
- DEB_BUILD_GNU_TYPE ?= $(call dpkg_late_eval,DEB_BUILD_GNU_TYPE,dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- # Disabled for squeeze-backports
- #DEB_BUILD_MULTIARCH ?= $(call dpkg_late_eval,DEB_BUILD_MULTIARCH,dpkg-architecture -qDEB_BUILD_MULTIARCH)
++# Squeeze-backports: we dropped MULTIARCH from "var" list
+ $(foreach machine,BUILD HOST,\
- $(foreach var,ARCH ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\
++ $(foreach var,ARCH ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE,\
+ $(eval $(call dpkg_architecture_setvar,DEB_$(machine)_$(var)))))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list