Package: libglc-dev
Version: 0.7.2-5
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:warzone2100
warzone2100 fails to cross build from source, because it cannot find
quesoglc.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig. Thus quesoglc.pc should be moved to a multiarch
libdir. The attached patch implements that. Please consider applying it.
Helmut
diff --minimal -Nru quesoglc-0.7.2/debian/changelog
quesoglc-0.7.2/debian/changelog
--- quesoglc-0.7.2/debian/changelog 2011-08-15 19:44:42.000000000 +0200
+++ quesoglc-0.7.2/debian/changelog 2018-06-11 16:35:25.000000000 +0200
@@ -1,3 +1,10 @@
+quesoglc (0.7.2-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Configure with a multiarch --libdir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 11 Jun 2018 16:35:25 +0200
+
quesoglc (0.7.2-5) unstable; urgency=low
[ Paul Wise ]
diff --minimal -Nru quesoglc-0.7.2/debian/libglc-dev.install
quesoglc-0.7.2/debian/libglc-dev.install
--- quesoglc-0.7.2/debian/libglc-dev.install 2011-08-15 10:42:16.000000000
+0200
+++ quesoglc-0.7.2/debian/libglc-dev.install 2018-06-11 16:35:25.000000000
+0200
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/libGLC.a
-usr/lib/libGLC.so
-usr/lib/pkgconfig/quesoglc.pc
+usr/lib/*/libGLC.a
+usr/lib/*/libGLC.so
+usr/lib/*/pkgconfig/quesoglc.pc
diff --minimal -Nru quesoglc-0.7.2/debian/libglc0.install
quesoglc-0.7.2/debian/libglc0.install
--- quesoglc-0.7.2/debian/libglc0.install 2011-03-11 07:19:31.000000000
+0100
+++ quesoglc-0.7.2/debian/libglc0.install 2018-06-11 16:35:25.000000000
+0200
@@ -1 +1 @@
-usr/lib/libGLC.so.*
+usr/lib/*/libGLC.so.*
diff --minimal -Nru quesoglc-0.7.2/debian/rules quesoglc-0.7.2/debian/rules
--- quesoglc-0.7.2/debian/rules 2011-08-15 19:20:56.000000000 +0200
+++ quesoglc-0.7.2/debian/rules 2018-06-11 16:35:25.000000000 +0200
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
%:
dh $@ --parallel --with autoreconf
@@ -9,11 +11,11 @@
override_dh_auto_configure:
rm -rf src/glew.c src/fribidi
- dh_auto_configure
+ dh_auto_configure -- --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'
override_dh_auto_install:
dh_auto_install
- rm $(CURDIR)/debian/tmp/usr/lib/libGLC.la
+ rm $(CURDIR)/debian/tmp/usr/lib/*/libGLC.la
override_dh_install:
dh_install --fail-missing
