Bug#859301: unblock: ncbi-vdb/2.8.1+dfsg-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ncbi-vdb
Just applied the patch from Graham Inggs to fix bug #859260
(include/attach the debdiff against the package in testing)
unblock ncbi-vdb/2.8.1+dfsg-2
-- System Information:
Debian Release: 8.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru ncbi-vdb-2.8.1+dfsg/debian/changelog ncbi-vdb-2.8.1+dfsg/debian/changelog
--- ncbi-vdb-2.8.1+dfsg/debian/changelog 2017-01-11 15:27:16.000000000 +0100
+++ ncbi-vdb-2.8.1+dfsg/debian/changelog 2017-04-01 22:50:01.000000000 +0200
@@ -1,3 +1,11 @@
+ncbi-vdb (2.8.1+dfsg-2) unstable; urgency=medium
+
+ * Fix install dir by using DEB_HOST_MULTIARCH instead of DEB_BUILD_GNU_TYPE
+ (thanks for the patch to Graham Inggs <ginggs@debian.org>)
+ Closes: #859260
+
+ -- Andreas Tille <tille@debian.org> Sat, 01 Apr 2017 22:50:01 +0200
+
ncbi-vdb (2.8.1+dfsg-1) unstable; urgency=medium
* New upstream version
diff -Nru ncbi-vdb-2.8.1+dfsg/debian/rules ncbi-vdb-2.8.1+dfsg/debian/rules
--- ncbi-vdb-2.8.1+dfsg/debian/rules 2017-01-11 15:27:16.000000000 +0100
+++ ncbi-vdb-2.8.1+dfsg/debian/rules 2017-04-01 22:50:01.000000000 +0200
@@ -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)
Reply to: