diff -Nru ngs-sdk-1.3.0/debian/changelog ngs-sdk-1.3.0/debian/changelog --- ngs-sdk-1.3.0/debian/changelog 2017-04-01 06:52:59.000000000 +0000 +++ ngs-sdk-1.3.0/debian/changelog 2017-04-01 20:33:07.000000000 +0000 @@ -1,15 +1,10 @@ -ngs-sdk (1.3.0-1ubuntu2) zesty; urgency=medium +ngs-sdk (1.3.0-2) unstable; urgency=medium - * Install .a files to the correct multiarch directory on i386 + * Fix install dir by using DEB_HOST_MULTIARCH instead of DEB_BUILD_GNU_TYPE + (thanks for the patch to Graham Inggs ) + Closes: #859257 - -- Graham Inggs Sat, 01 Apr 2017 08:52:59 +0200 - -ngs-sdk (1.3.0-1ubuntu1) zesty; urgency=medium - - * Only build on x86 and x86_64 for now due to platform specific code - present. See debian bug 813559 for more details. - - -- Bhavani Shankar Sun, 26 Feb 2017 08:08:24 +0530 + -- Andreas Tille Sat, 01 Apr 2017 22:33:07 +0200 ngs-sdk (1.3.0-1) unstable; urgency=medium diff -Nru ngs-sdk-1.3.0/debian/control ngs-sdk-1.3.0/debian/control --- ngs-sdk-1.3.0/debian/control 2017-02-26 04:22:17.000000000 +0000 +++ ngs-sdk-1.3.0/debian/control 2017-04-01 20:33:07.000000000 +0000 @@ -1,6 +1,5 @@ Source: ngs-sdk -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team Uploaders: Andreas Tille , Olivier Sallou , Vincent Danjean @@ -21,7 +20,7 @@ Homepage: https://github.com/ncbi/ngs Package: libngs-sdk1 -Architecture: i386 amd64 +Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -39,7 +38,7 @@ and Java. Package: libngs-sdk-dev -Architecture: i386 amd64 +Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -60,7 +59,7 @@ This is the development package. Package: libngs-java -Architecture: i386 amd64 +Architecture: any Section: java Depends: ${misc:Depends}, ${java:Depends}, @@ -82,7 +81,7 @@ Java bindings. Package: python-ngs -Architecture: i386 amd64 +Architecture: any Section: python Depends: ${python:Depends}, ${misc:Depends}, @@ -103,7 +102,7 @@ Python bindings. Package: python3-ngs -Architecture: i386 amd64 +Architecture: any Section: python Depends: ${python3:Depends}, ${misc:Depends}, diff -Nru ngs-sdk-1.3.0/debian/rules ngs-sdk-1.3.0/debian/rules --- ngs-sdk-1.3.0/debian/rules 2017-04-01 06:52:54.000000000 +0000 +++ ngs-sdk-1.3.0/debian/rules 2017-04-01 20:33:07.000000000 +0000 @@ -8,10 +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) @@ -24,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) @@ -44,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 @@ -53,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 \