Bug#836453: xserver-xorg-dev: please move xorg-server.pc to a multiarch path

[Helmut Grohne <helmut@subdivi.de>]

Package: xserver-xorg-dev
Version: 2:1.18.4-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Control: affects -1 + src:xf86-input-wacom src:xserver-xorg-input-evdev src:xserver-xorg-input-libinput src:xserver-xorg-input-mouse src:xserver-xorg-input-synaptics src:xserver-xorg-video-amdgpu src:xserver-xorg-video-ati src:xserver-xorg-video-cirrus src:xserver-xorg-video-fbdev src:xserver-xorg-video-mach64 src:xserver-xorg-video-mga src:xserver-xorg-video-neomagic src:xserver-xorg-video-nouveau src:xserver-xorg-video-r128 src:xserver-xorg-video-savage src:xserver-xorg-video-siliconmotion src:xserver-xorg-video-sisusb src:xserver-xorg-video-tdfx src:xserver-xorg-video-trident

Hi,

xserver-xorg-dev makes the aforementioned affected packages fail to
cross build from source, because pkg-config does not consider[1]
/usr/lib/pkgconfig/ during cross compilation. In contrast, it always
considers /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig, so moving
xorg-server.pc there will make both native and cross builds happy.

The requested change is implemented in the attached patch for your
convenience.

Helmut

[1] This choice was discusses with pkg-config maintainer Tollef Fog Heen
    and the conclusion was that packages should move their .pc files.

diff -u xorg-server-1.18.4/debian/changelog xorg-server-1.18.4/debian/changelog
--- xorg-server-1.18.4/debian/changelog
+++ xorg-server-1.18.4/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install xserver-xorg.pc into a multiarch path. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 03 Sep 2016 09:02:57 +0200
+
 xorg-server (2:1.18.4-1) unstable; urgency=medium
 
   * New upstream stable release.
diff -u xorg-server-1.18.4/debian/rules xorg-server-1.18.4/debian/rules
--- xorg-server-1.18.4/debian/rules
+++ xorg-server-1.18.4/debian/rules
@@ -21,10 +21,7 @@
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+include /usr/share/dpkg/architecture.mk
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
@@ -396,6 +393,8 @@
 	install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
 endif
 endif
+	$(INSTALL) -m 755 -d debian/xserver-xorg-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	$(INSTALL) -m 644 debian/tmp/main/usr/lib/pkgconfig/xorg-server.pc debian/xserver-xorg-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
 	dh_installdebconf -s
 	dh_installman -s
 	dh_link -s
diff -u xorg-server-1.18.4/debian/xserver-xorg-dev.install xorg-server-1.18.4/debian/xserver-xorg-dev.install
--- xorg-server-1.18.4/debian/xserver-xorg-dev.install
+++ xorg-server-1.18.4/debian/xserver-xorg-dev.install
@@ -1,5 +1,4 @@
 main/usr/include/xorg	usr/include
-main/usr/lib/pkgconfig/xorg-server.pc	usr/lib/pkgconfig
 main/usr/share/aclocal	usr/share
 
 ../../debian/local/dh_xsf_substvars usr/bin