Package: xserver-xorg-input-wacom
Version: 0.30.0-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

gnome-settings-daemon and cinnamon-settings-daemon fail to cross build
from source, because they fail to find xorg-wacom.pc. pkg-config does
not consider /usr/lib/pkgconfig for cross compiling, so the file is not
found. Please move it to a multiarch location. I am proposing the
attached patch to address that.

Helmut
diff -u xf86-input-wacom-0.30.0/debian/changelog 
xf86-input-wacom-0.30.0/debian/changelog
--- xf86-input-wacom-0.30.0/debian/changelog
+++ xf86-input-wacom-0.30.0/debian/changelog
@@ -1,3 +1,10 @@
+xf86-input-wacom (0.30.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move xorg-wacom.pc to a multiarch path.  Closes: #-1
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 15 Sep 2016 21:51:04 +0200
+
 xf86-input-wacom (0.30.0-1) unstable; urgency=medium
 
   * Fixes FTBFS in Stretch due to missing headers needed for fstat(2).
diff -u xf86-input-wacom-0.30.0/debian/rules 
xf86-input-wacom-0.30.0/debian/rules
--- xf86-input-wacom-0.30.0/debian/rules
+++ xf86-input-wacom-0.30.0/debian/rules
@@ -8,8 +8,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 
 objdir = objs
@@ -60,6 +59,9 @@
        mv debian/$(package)/lib/udev/rules.d/wacom.rules \
           debian/$(package)/lib/udev/rules.d/69-wacom.rules
        $(RM) debian/$(package)/usr/lib/xorg/modules/input/*.la
+       mkdir -p debian/$(package)/usr/lib/$(DEB_HOST_MULTIARCH)
+       mv debian/$(package)/usr/lib/pkgconfig \
+               debian/$(package)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 
        echo "xinpdriver:Depends=$(XDEP)" > $(XSUB)
        echo "xinpdriver:Provides=xorg-driver-input" >> $(XSUB)

Reply via email to