[Reproducible-commits] [dpkg] 04/61: debian: Do not change libdir for the entire dpkg

[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 3ce3a7adeb8c815734a35b95aee96bacd1aafde4
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Aug 9 05:38:12 2015 +0200

    debian: Do not change libdir for the entire dpkg
    
    This changes too many directories that are expected to be non-multiarch
    aware. Instead perform the moving to the correct multiarch directories
    in debian/rules.
    
    Closes: #794977
---
 debian/changelog            | 3 +++
 debian/dselect.install      | 2 +-
 debian/libdpkg-perl.install | 2 +-
 debian/rules                | 7 ++++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c7d091..b2f7c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ dpkg (1.18.3) UNRELEASED; urgency=low
       Closes: #794694
   * Packaging:
     - Remove unneeded --sourcedir options from dh_install calls.
+    - Do not change libdir to a multi-arch directory for the entire dpkg.
+      This changes too many directories that are expected to be non-multiarch
+      aware. Closes: #794977
   * Documentation:
     - Fix typos for --predep-package option name. Closes: #794688
 
diff --git a/debian/dselect.install b/debian/dselect.install
index 524fe52..b0ab24a 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
+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-perl.install b/debian/libdpkg-perl.install
index 8c44bdf..a9f9f31 100644
--- a/debian/libdpkg-perl.install
+++ b/debian/libdpkg-perl.install
@@ -1,4 +1,4 @@
-usr/lib/*/dpkg/parsechangelog usr/lib/dpkg
+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 f4bd7bf..0c535a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS)))
 endif
 
 D := $(CURDIR)/debian/tmp
+D_MA := $(D)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # Create configure script if necessary, automake handles rebuilding it.
 configure:
@@ -57,7 +58,6 @@ build-tree/config.status: configure
 		--infodir=\$${datadir}/info \
 		--sysconfdir=/etc \
 		--sbindir=/sbin \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--localstatedir=/var \
 		--with-zlib \
 		--with-liblzma \
@@ -86,6 +86,11 @@ install: check
 
 	cd build-tree && $(MAKE) DESTDIR=$(D) install
 
+	# Passing --libdir to configure has too many side effects, install
+	# the paths into Multi-Arch directories here instead.
+	mkdir -p $(D_MA)
+	mv $(D)/usr/lib/libdpkg.a $(D_MA)
+
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	# Ubuntu's «i386» architecture is built for i686 (the Debian default
 	# is i586).

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