[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#930204: libadplug-dev: move adplug.pc to a multiarch location



Package: libadplug-dev
Version: 2.2.1+dfsg3-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:adplay

adplay fails to cross build from source, because it does not find
adplug.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig. We'll have to move adplug.pc to
/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig. Please consider applying the
attached patch.

Helmut
diff --minimal -Nru adplug-2.2.1+dfsg3/debian/changelog adplug-2.2.1+dfsg3/debian/changelog
--- adplug-2.2.1+dfsg3/debian/changelog	2019-01-04 23:15:15.000000000 +0100
+++ adplug-2.2.1+dfsg3/debian/changelog	2019-06-08 08:50:11.000000000 +0200
@@ -1,3 +1,9 @@
+adplug (2.2.1+dfsg3-2) UNRELEASED; urgency=medium
+
+  * Install adplug.pc to a multiarch location. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 08 Jun 2019 08:50:11 +0200
+
 adplug (2.2.1+dfsg3-1) unstable; urgency=medium
 
   * Orphan package, previous maintainer hasn't changed the package
diff --minimal -Nru adplug-2.2.1+dfsg3/debian/libadplug-2.2.1-0v5.install adplug-2.2.1+dfsg3/debian/libadplug-2.2.1-0v5.install
--- adplug-2.2.1+dfsg3/debian/libadplug-2.2.1-0v5.install	2015-08-21 17:45:55.000000000 +0200
+++ adplug-2.2.1+dfsg3/debian/libadplug-2.2.1-0v5.install	2019-06-08 08:50:02.000000000 +0200
@@ -1 +1 @@
-/usr/lib/*.so.*
+/usr/lib/*/*.so.*
diff --minimal -Nru adplug-2.2.1+dfsg3/debian/libadplug-dev.install adplug-2.2.1+dfsg3/debian/libadplug-dev.install
--- adplug-2.2.1+dfsg3/debian/libadplug-dev.install	2011-05-25 17:32:57.000000000 +0200
+++ adplug-2.2.1+dfsg3/debian/libadplug-dev.install	2019-06-08 08:50:08.000000000 +0200
@@ -1,4 +1,4 @@
 /usr/include/*
-/usr/lib/*.a
-/usr/lib/*.so
-/usr/lib/pkgconfig/*
+/usr/lib/*/*.a
+/usr/lib/*/*.so
+/usr/lib/*/pkgconfig/*
diff --minimal -Nru adplug-2.2.1+dfsg3/debian/rules adplug-2.2.1+dfsg3/debian/rules
--- adplug-2.2.1+dfsg3/debian/rules	2015-05-23 01:00:29.000000000 +0200
+++ adplug-2.2.1+dfsg3/debian/rules	2019-06-08 08:49:43.000000000 +0200
@@ -1,3 +1,9 @@
 #!/usr/bin/make -f
+
+include /usr/share/dpkg/architecture.mk
+
 %:
 	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'

Reply to: