[Debian-med-packaging] Bug#859260: libncbi-vdb-dev: installs .a files to the incorrect directory

[Graham Inggs]

Package: libncbi-vdb-dev
Version: 2.8.0+dfsg-1
Severity: serious
Tags: patch

Hi Maintainer

Similar to #859257 in libngs-sdk-dev, .a files are installed to the
incorrect directory (e.g.
/usr/lib/i686-linux-gnu/ instead of /usr/lib/i386-linux-gnu/).

The attached patch use s DEB_HOST_MULTIARCH instead of
DEB_BUILD_GNU_TYPE to install .a files to the correct multiarch
directory.

Regards
Graham
-------------- next part --------------
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 
 OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-BUILDTYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # since build-results are not ending up in the proper dir its saver to use "*" instead of "$(CPU)"
 SODIR := $(DEBPKGNAME)/$(DEBPKGNAME)/$(OS)/gcc
 VDB_ARCH := $(word 1, $(subst -, ,$(DEB_HOST_MULTIARCH)))
@@ -25,7 +25,7 @@
 	if [ -e ngs-sdk/Makefile.config.$(OS).$(CPU) ] ; then \
 		dh_auto_clean ; \
 	fi
-	rm -rf $(DEBPKGNAME)/$(BUILDTYPE)
+	rm -rf $(DEBPKGNAME)/$(MULTIARCH)
 
 override_dh_auto_configure:
 	# that's no standard configure script lacking support of default options
@@ -34,7 +34,7 @@
 	# so we need to go with patches.  The options are specified anyway.
 	ln -s /usr/lib/jvm/default-java/include/jni.h		libs/ngs-jni
 	ln -s /usr/lib/jvm/default-java/include/linux/jni_md.h	libs/ngs-jni
-	./configure --build=$(BUILDTYPE) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
+	./configure --build=$(MULTIARCH) --prefix=/usr --build-prefix=$(CURDIR)/debian/tmp/usr --with-ngs-sdk-prefix=/usr --with-debug --with-ngs-java-prefix=/usr/share/java
 	# no idea how to convince configure script to use the correct include dir so patching result afterwards
 	sed -i 's?HDF5_INCDIR = /usr/include?&/hdf5/serial?' build/Makefile.config*
 
@@ -61,16 +61,16 @@
 		    --override s/libmbedcrypto0-dev/libmbedtls-dev/ \
 		    --override s/libmbedtls10-dev/libmbedtls-dev/ \
 		    --override s/libmbedx509-0-dev/libmbedtls-dev/ \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(BUILDTYPE) \
-		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(BUILDTYPE) \
-                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(BUILDTYPE) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkff.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libktst.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxfs.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkxml.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libload.a usr/lib/$(MULTIARCH) \
+		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui.a usr/lib/$(MULTIARCH) \
+                    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libtui_cpp.a usr/lib/$(MULTIARCH) \
 		    --movedev interfaces usr/include \
 		    debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-vdb.so
 	mv debian/libncbi-vdb-dev/usr/include/interfaces debian/libncbi-vdb-dev/usr/include/$(DEBPKGNAME)