Bug#962432: move libcw.pc to a multiarch location
Package: libcw6-dev
Version: 3.5.1-3
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:cwdaemon
cwdaemon fails to cross build from source, because it cannot find
libcw.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig. The .pc file should be moved to a multiarch
location. Please consider applying the attached patch.
Helmut
diff --minimal -Nru unixcw-3.5.1/debian/changelog unixcw-3.5.1/debian/changelog
--- unixcw-3.5.1/debian/changelog 2019-02-19 09:46:06.000000000 +0100
+++ unixcw-3.5.1/debian/changelog 2020-06-07 23:05:34.000000000 +0200
@@ -1,3 +1,10 @@
+unixcw (3.5.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use a multiarch --libdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 07 Jun 2020 23:05:34 +0200
+
unixcw (3.5.1-3) unstable; urgency=medium
* Team upload.
diff --minimal -Nru unixcw-3.5.1/debian/libcw6-dev.install unixcw-3.5.1/debian/libcw6-dev.install
--- unixcw-3.5.1/debian/libcw6-dev.install 2019-02-19 09:31:44.000000000 +0100
+++ unixcw-3.5.1/debian/libcw6-dev.install 2020-06-07 23:05:18.000000000 +0200
@@ -1,4 +1,4 @@
-usr/lib/libcw.a
+usr/lib/*/libcw.a
# lintian-info -t dev-pkg-without-shlib-symlink | non-dev-pkg-with-shlib-symlink:
# "A "-dev" package is supposed to install a "libsomething.so" symbolic
@@ -15,10 +15,10 @@
# that it should be created at some point. I can't see any explicit call
# to "ln -s" in debian/* files... But as long as it works implicitly, I'm
# willing to think that this is just how things should be.
-usr/lib/libcw.so
+usr/lib/*/libcw.so
usr/include/libcw.h
usr/include/libcw_debug.h
usr/share/man/man3
usr/share/doc/libcw6-dev
-usr/lib/pkgconfig/libcw.pc
+usr/lib/*/pkgconfig/libcw.pc
diff --minimal -Nru unixcw-3.5.1/debian/libcw6.install unixcw-3.5.1/debian/libcw6.install
--- unixcw-3.5.1/debian/libcw6.install 2019-02-19 09:31:55.000000000 +0100
+++ unixcw-3.5.1/debian/libcw6.install 2020-06-07 23:05:26.000000000 +0200
@@ -1,3 +1,3 @@
-usr/lib/libcw.so.6.6.1
-usr/lib/libcw.so.6
+usr/lib/*/libcw.so.6.6.1
+usr/lib/*/libcw.so.6
usr/share/man/man7/cw.7
diff --minimal -Nru unixcw-3.5.1/debian/rules unixcw-3.5.1/debian/rules
--- unixcw-3.5.1/debian/rules 2019-02-19 09:38:46.000000000 +0100
+++ unixcw-3.5.1/debian/rules 2020-06-07 23:04:59.000000000 +0200
@@ -41,7 +41,7 @@
config.status: configure
dh_testdir
# Add here commands to configure the package.
- QT4DIR="/usr/share/qt4" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ QT4DIR="/usr/share/qt4" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
#Architecture
Reply to: