Package: libbotan-2-dev Version: 2.4.0-6 Tags: patch User: helm...@debian.org Usertags: rebootstrap Control: affects -1 + src:qtcreator
qtcreator fails to cross build from source, because it cannot find botan-2.pc. During cross compilation, pkg-config searches /usr/lib/<triplet>/pkgconfig and /usr/share/pkgconfig, but not /usr/lib/pkgconfig. The latter is where botan-2.pc currently lives. The attached patch moves it to the multiarch location. Please consider applying it. Helmut
diff --minimal -Nru botan-2.4.0/debian/changelog botan-2.4.0/debian/changelog --- botan-2.4.0/debian/changelog 2018-04-10 19:55:33.000000000 +0200 +++ botan-2.4.0/debian/changelog 2018-04-11 17:21:36.000000000 +0200 @@ -1,3 +1,10 @@ +botan (2.4.0-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use multiarch paths. (closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Wed, 11 Apr 2018 17:21:36 +0200 + botan (2.4.0-6) unstable; urgency=high * Backport CVE-2018-9860 security fix for memory over read in TLS CBC diff --minimal -Nru botan-2.4.0/debian/libbotan-2-4.install botan-2.4.0/debian/libbotan-2-4.install --- botan-2.4.0/debian/libbotan-2-4.install 2017-01-09 20:48:14.000000000 +0100 +++ botan-2.4.0/debian/libbotan-2-4.install 2018-04-11 17:21:36.000000000 +0200 @@ -1 +1 @@ -usr/lib/libbotan-2.so.* +usr/lib/*/libbotan-2.so.* diff --minimal -Nru botan-2.4.0/debian/libbotan-2-dev.install botan-2.4.0/debian/libbotan-2-dev.install --- botan-2.4.0/debian/libbotan-2-dev.install 2017-01-09 20:48:14.000000000 +0100 +++ botan-2.4.0/debian/libbotan-2-dev.install 2018-04-11 17:21:36.000000000 +0200 @@ -1,4 +1,4 @@ usr/include/ -usr/lib/libbotan-2.a -usr/lib/libbotan-2.so -usr/lib/pkgconfig/ +usr/lib/*/libbotan-2.a +usr/lib/*/libbotan-2.so +usr/lib/*/pkgconfig/ diff --minimal -Nru botan-2.4.0/debian/python3-botan.install botan-2.4.0/debian/python3-botan.install --- botan-2.4.0/debian/python3-botan.install 2017-12-11 18:18:00.000000000 +0100 +++ botan-2.4.0/debian/python3-botan.install 2018-04-11 17:21:36.000000000 +0200 @@ -1 +1 @@ -usr/lib/python3/site-packages/* /usr/lib/python3/dist-packages/ +usr/lib/*/python3/site-packages/* /usr/lib/python3/dist-packages/ diff --minimal -Nru botan-2.4.0/debian/rules botan-2.4.0/debian/rules --- botan-2.4.0/debian/rules 2018-04-10 19:55:33.000000000 +0200 +++ botan-2.4.0/debian/rules 2018-04-11 17:21:31.000000000 +0200 @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpkg/architecture.mk + DOCPKG = $(CURDIR)/debian/libbotan-2-doc override_dh_clean: @@ -13,6 +15,7 @@ override_dh_auto_configure: $(CURDIR)/configure.py \ --prefix=/usr/ \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ $(if $(filter $(DEB_HOST_ARCH), armel armhf),--disable-neon) \ --with-rst2man \ --with-bzip2 \