[Reproducible-commits] [dpkg] 57/90: debian: Make the libdpkg-dev package Multi-Arch:same

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 795c00ee8a2b322c6729a5cbfee8af326d6e3a7c
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Jun 27 03:13:56 2015 +0200

    debian: Make the libdpkg-dev package Multi-Arch:same
---
 debian/changelog            | 2 ++
 debian/control              | 1 +
 debian/dselect.install      | 2 +-
 debian/libdpkg-dev.install  | 4 ++--
 debian/libdpkg-perl.install | 2 +-
 debian/rules                | 2 ++
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ecfaa4..0a86880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ dpkg (1.18.2) UNRELEASED; urgency=low
     - Future-proof tar invocations in Dpkg::Source::Archive for options that
       might become positional in the future, and by always placing function
       options first.
+  * Packaging:
+    - Make the libdpkg-dev package Multi-Arch:same.
   * Documentation:
     - Fix grammar in dpkg-architecture(1).
       Thanks to Chris Lamb <lamby at debian.org>. Closes: #787616
diff --git a/debian/control b/debian/control
index 21dde5a..47971a3 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: libdpkg-dev
 Section: libdevel
 Priority: optional
 Architecture: any
+Multi-Arch: same
 Depends: zlib1g-dev, liblzma-dev, libbz2-dev, ${misc:Depends}
 Description: Debian package management static library
  This package provides the header files and static library necessary to
diff --git a/debian/dselect.install b/debian/dselect.install
index d840e8c..524fe52 100644
--- a/debian/dselect.install
+++ b/debian/dselect.install
@@ -2,7 +2,7 @@
 
 etc/dpkg/dselect.cfg.d
 usr/bin/dselect
-usr/lib/dpkg/methods
+usr/lib/*/dpkg/methods usr/lib/dpkg
 usr/share/locale/*/LC_MESSAGES/dselect.mo
 usr/share/perl5/Dselect
 var/lib/dpkg/methods
diff --git a/debian/libdpkg-dev.install b/debian/libdpkg-dev.install
index ae50bdd..4ba6e9c 100644
--- a/debian/libdpkg-dev.install
+++ b/debian/libdpkg-dev.install
@@ -1,3 +1,3 @@
 usr/include/dpkg/*.h
-usr/lib/pkgconfig/libdpkg.pc
-usr/lib/libdpkg.a
+usr/lib/*/pkgconfig/libdpkg.pc
+usr/lib/*/libdpkg.a
diff --git a/debian/libdpkg-perl.install b/debian/libdpkg-perl.install
index 4d4c23d..8c44bdf 100644
--- a/debian/libdpkg-perl.install
+++ b/debian/libdpkg-perl.install
@@ -1,4 +1,4 @@
-usr/lib/dpkg/parsechangelog
+usr/lib/*/dpkg/parsechangelog usr/lib/dpkg
 usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
 usr/share/man/man3/Dpkg*.3
 usr/share/perl5/Dpkg*
diff --git a/debian/rules b/debian/rules
index 950d8df..87cff2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ dpkg_buildflags = \
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Support cross-compiling.
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -54,6 +55,7 @@ build-tree/config.status: configure
 		--infodir=\$${datadir}/info \
 		--sysconfdir=/etc \
 		--sbindir=/sbin \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--localstatedir=/var \
 		--with-zlib \
 		--with-liblzma \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git