Bug#885097: move libpanel-applet.pc to a multiarch location

[Helmut Grohne]

Package: libpanel-applet-dev
Version: 3.26.0-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:gnome-applets

gnome-applets fails to cross build from source, because it cannot find
libpanel-applet.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig and that's exactly where the file is placed. Please
move it to a multiarch location. I'm attaching a patch for your
convenience.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-panel-3.26.0/debian/changelog gnome-panel-3.26.0/debian/changelog
--- gnome-panel-3.26.0/debian/changelog	2017-10-10 12:04:41.000000000 +0200
+++ gnome-panel-3.26.0/debian/changelog	2017-12-23 16:06:48.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-panel (3.26.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move libpanel-applet.pc to a multiarch location. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 23 Dec 2017 16:06:48 +0100
+
 gnome-panel (3.26.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru gnome-panel-3.26.0/debian/libpanel-applet-dev.install gnome-panel-3.26.0/debian/libpanel-applet-dev.install
--- gnome-panel-3.26.0/debian/libpanel-applet-dev.install	2017-10-10 12:04:41.000000000 +0200
+++ gnome-panel-3.26.0/debian/libpanel-applet-dev.install	2017-12-23 16:06:39.000000000 +0100
@@ -1,3 +1,3 @@
 usr/include
 usr/lib/libpanel-applet*.so
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
diff --minimal -Nru gnome-panel-3.26.0/debian/rules gnome-panel-3.26.0/debian/rules
--- gnome-panel-3.26.0/debian/rules	2017-10-10 12:04:41.000000000 +0200
+++ gnome-panel-3.26.0/debian/rules	2017-12-23 16:06:27.000000000 +0100
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 %:
 	dh $@ --with gnome
 
@@ -9,6 +11,8 @@
 override_dh_auto_install:
 	dh_auto_install
 	rm debian/tmp/usr/lib/libpanel-applet.la debian/tmp/usr/lib/gnome-panel/modules/*.la
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V -- -c4