Bug#838207: move pkg-config file zapojit-0.0.pc to a multiarch path

[Helmut Grohne]

Source: libzapojit
Version: 0.0.3-1
Tags: patch
Control: affects -1 + src:gnome-online-miners
User: helmutg at debian.org
Usertags: rebootstrap

gnome-online-miners fails to cross build from source, because it cannot
find zapojit-0.0.pc. During cross compilation, pkg-config does not
consider /usr/lib/pkgconfig. Please move zapojit-0.0.pc to a multiarch
path. The attached patch achieves that by adding a suitable --libdir.
Beyond moving the files it does not try to add more multiarch
capabilities, but that would be welcome nonetheless. Please consider
applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru libzapojit-0.0.3/debian/changelog libzapojit-0.0.3/debian/changelog
--- libzapojit-0.0.3/debian/changelog	2013-03-24 14:26:26.000000000 +0100
+++ libzapojit-0.0.3/debian/changelog	2016-09-18 14:49:31.000000000 +0200
@@ -1,3 +1,10 @@
+libzapojit (0.0.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass multiarch --libdir to configure. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 18 Sep 2016 14:49:10 +0200
+
 libzapojit (0.0.3-1) unstable; urgency=low
 
   * New upstream release.
diff --minimal -Nru libzapojit-0.0.3/debian/gir1.2-zpj-0.0.install libzapojit-0.0.3/debian/gir1.2-zpj-0.0.install
--- libzapojit-0.0.3/debian/gir1.2-zpj-0.0.install	2012-06-25 04:13:44.000000000 +0200
+++ libzapojit-0.0.3/debian/gir1.2-zpj-0.0.install	2016-09-18 14:52:28.000000000 +0200
@@ -1 +1 @@
-usr/lib/girepository-1.0/*.typelib
+usr/lib/*/girepository-1.0/*.typelib
diff --minimal -Nru libzapojit-0.0.3/debian/libzapojit-0.0-0.install libzapojit-0.0.3/debian/libzapojit-0.0-0.install
--- libzapojit-0.0.3/debian/libzapojit-0.0-0.install	2012-06-25 03:57:22.000000000 +0200
+++ libzapojit-0.0.3/debian/libzapojit-0.0-0.install	2016-09-18 14:49:42.000000000 +0200
@@ -1 +1 @@
-usr/lib/libzapojit*.so.*
+usr/lib/*/libzapojit*.so.*
diff --minimal -Nru libzapojit-0.0.3/debian/libzapojit-dev.install libzapojit-0.0.3/debian/libzapojit-dev.install
--- libzapojit-0.0.3/debian/libzapojit-dev.install	2012-06-25 03:57:22.000000000 +0200
+++ libzapojit-0.0.3/debian/libzapojit-dev.install	2016-09-18 14:49:51.000000000 +0200
@@ -1,4 +1,4 @@
 usr/include/libzapojit-*/zpj/
-usr/lib/libzapojit*.so
-usr/lib/pkgconfig/zapojit*
+usr/lib/*/libzapojit*.so
+usr/lib/*/pkgconfig/zapojit*
 usr/share/gir-1.0/*.gir
diff --minimal -Nru libzapojit-0.0.3/debian/rules libzapojit-0.0.3/debian/rules
--- libzapojit-0.0.3/debian/rules	2012-06-25 03:57:22.000000000 +0200
+++ libzapojit-0.0.3/debian/rules	2016-09-18 14:49:07.000000000 +0200
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -14,3 +15,5 @@
 common-binary-predeb-arch:: list-missing
 
 DEB_DH_MAKESHLIBS_ARGS_$(libzapojit) = -- -c4
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)