Bug#859298: unblock: ngs-sdk/1.3.0-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ngs-sdk
Just applied the patch provided for bug #859257.
unblock ngs-sdk/1.3.0-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 ngs-sdk-1.3.0/debian/changelog ngs-sdk-1.3.0/debian/changelog
--- ngs-sdk-1.3.0/debian/changelog 2016-11-09 08:54:53.000000000 +0100
+++ ngs-sdk-1.3.0/debian/changelog 2017-04-01 22:33:07.000000000 +0200
@@ -1,3 +1,11 @@
+ngs-sdk (1.3.0-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: #859257
+
+ -- Andreas Tille <tille@debian.org> Sat, 01 Apr 2017 22:33:07 +0200
+
ngs-sdk (1.3.0-1) unstable; urgency=medium
* New upstream release
diff -Nru ngs-sdk-1.3.0/debian/rules ngs-sdk-1.3.0/debian/rules
--- ngs-sdk-1.3.0/debian/rules 2016-11-09 08:54:53.000000000 +0100
+++ ngs-sdk-1.3.0/debian/rules 2017-04-01 22:33:07.000000000 +0200
@@ -8,9 +8,9 @@
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)/$(BUILDTYPE)/$(DEBPKGNAME)/$(OS)/gcc/*
+SODIR := $(DEBPKGNAME)/$(MULTIARCH)/$(DEBPKGNAME)/$(OS)/gcc/*
build2vers := $(shell pyversions -sv)
build3vers := $(shell py3versions -sv)
@@ -23,19 +23,19 @@
# dh_auto_clean --sourcedirectory=$(DEBPKGNAME) ; \
dh_auto_clean ; \
fi
- rm -rf ngs-java/$(BUILDTYPE)
- rm -rf ngs-bam/$(BUILDTYPE)
+ rm -rf ngs-java/$(MULTIARCH)
+ rm -rf ngs-bam/$(MULTIARCH)
rm -f ngs-bam/Makefile.config
rm -f ngs-bam/Makefile.config.install.linux.x86_64.prl
rm -f ngs-bam/Makefile.config.linux.x86_64
rm -f ngs-bam/reconfigure
- rm -rf $(DEBPKGNAME)/$(BUILDTYPE)
+ rm -rf $(DEBPKGNAME)/$(MULTIARCH)
rm -rf ngs-python/build
override_dh_auto_configure:
# # that's no standard configure script lacking support of default options \
- ./configure --build=$(BUILDTYPE) --prefix=/usr -- --source=1.7
+ ./configure --build=$(MULTIARCH) --prefix=/usr -- --source=1.7
override_dh_auto_build:
#dh_auto_build --sourcedirectory=$(DEBPKGNAME)
@@ -43,7 +43,7 @@
dh_auto_build --sourcedirectory=$(DEBPKGNAME)
# Remove ngs-bam generation, expects ngs-sdk and cannot find a way
# to specify it
- #cd ngs-bam && LD_LIBRARY_PATH=../$(SODIR)/rel/lib ./configure --build=$(BUILDTYPE) --prefix=/usr --with-ngs-sdk-prefix=../ngs-sdk
+ #cd ngs-bam && LD_LIBRARY_PATH=../$(SODIR)/rel/lib ./configure --build=$(MULTIARCH) --prefix=/usr --with-ngs-sdk-prefix=../ngs-sdk
#dh_auto_build --sourcedirectory=ngs-bam
dh_auto_build --sourcedirectory=ngs-java -- JAVAC="javac -source 1.7 -target 1.7"
markdown_py -f README.html README.md
@@ -52,8 +52,8 @@
make -C $(DEBPKGNAME)/test
# Tests of Java binding disabled because need external lib ncbi-vdb,
# not available in Debian at this time
- #CLASSPATH=../$(BUILDTYPE)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples
- #CLASSPATH=../$(BUILDTYPE)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=../../$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples run_all
+ #CLASSPATH=../$(MULTIARCH)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples
+ #CLASSPATH=../$(MULTIARCH)/ngs-java/jar/ngs-java.jar LD_LIBRARY_PATH=../../$(SODIR)/rel/lib:$(LD_LIBRARY_PATH) make -C ngs-java/examples run_all
override_dh_auto_install:
d-shlibmove --commit \
@@ -61,8 +61,8 @@
--devunversioned \
--exclude-a \
--exclude-la \
- --movedev "$(SODIR)/rel/lib/*.a*" usr/lib/$(BUILDTYPE) \
- --movedev "$(SODIR)/rel/ilib/*.a" usr/lib/$(BUILDTYPE) \
+ --movedev "$(SODIR)/rel/lib/*.a*" usr/lib/$(MULTIARCH) \
+ --movedev "$(SODIR)/rel/ilib/*.a" usr/lib/$(MULTIARCH) \
--movedev ngs-sdk/ngs usr/include \
$(SODIR)/rel/lib/libngs-sdk.so
Reply to: