Bug#850873: move libglademm-2.4.pc to a multiarch path

[Helmut Grohne]

Package: libglademm-2.4-dev
Version: 2.6.7-5
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:paman src:paprefs

The packages listed above fail to cross build from source, because
pkg-config does not find libglademm-2.4.pc. In general, pkg-config does
not consider /usr/lib/pkgconfig during cross builds. It only considers
/usr/share/pkgconfig and /usr/lib/<triplet>/pkgconfig. Thus
libglademm-2.4.pc needs to be moved to the multiarch path. The attached
patch adds the relevant --libdir flag. Please consider applying it.

Helmut
-------------- next part --------------
diff -u libglademm2.4-2.6.7/debian/changelog libglademm2.4-2.6.7/debian/changelog
--- libglademm2.4-2.6.7/debian/changelog
+++ libglademm2.4-2.6.7/debian/changelog
@@ -1,3 +1,10 @@
+libglademm2.4 (2.6.7-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use multiarch paths. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 10 Jan 2017 20:53:43 +0100
+
 libglademm2.4 (2.6.7-5) unstable; urgency=medium
 
   * Team upload.
diff -u libglademm2.4-2.6.7/debian/control libglademm2.4-2.6.7/debian/control
--- libglademm2.4-2.6.7/debian/control
+++ libglademm2.4-2.6.7/debian/control
@@ -11,8 +11,8 @@
 Homepage: http://www.gtkmm.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/attic/libglademm2.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/attic/libglademm2.4
-Build-Depends: cdbs (>= 0.4.51),
-               debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3),
                dpkg-dev (>= 1.14.16),
                gnome-pkg-tools (>= 0.11),
                libglade2-dev (>= 1:2.6.1),
diff -u libglademm2.4-2.6.7/debian/libglademm-2.4-1v5.install libglademm2.4-2.6.7/debian/libglademm-2.4-1v5.install
--- libglademm2.4-2.6.7/debian/libglademm-2.4-1v5.install
+++ libglademm2.4-2.6.7/debian/libglademm-2.4-1v5.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -u libglademm2.4-2.6.7/debian/libglademm-2.4-dev.install libglademm2.4-2.6.7/debian/libglademm-2.4-dev.install
--- libglademm2.4-2.6.7/debian/libglademm-2.4-dev.install
+++ libglademm2.4-2.6.7/debian/libglademm-2.4-dev.install
@@ -2,5 +2,5 @@
-usr/lib/libglademm-2.4
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig
-usr/lib/*.la
+usr/lib/*/libglademm-2.4
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
+usr/lib/*/*.la
diff -u libglademm2.4-2.6.7/debian/rules libglademm2.4-2.6.7/debian/rules
--- libglademm2.4-2.6.7/debian/rules
+++ libglademm2.4-2.6.7/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -16,8 +17,9 @@
 SHVER := 2.6.0
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o