diff -Nru nexus-4.3.2-svn1921/debian/changelog nexus-4.3.2-svn1921/debian/changelog --- nexus-4.3.2-svn1921/debian/changelog 2014-04-16 22:08:23.000000000 +0200 +++ nexus-4.3.2-svn1921/debian/changelog 2014-07-25 14:50:53.000000000 +0200 @@ -1,3 +1,10 @@ +nexus (4.3.2-svn1921-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout. + + -- Gilles Filippini Fri, 25 Jul 2014 14:35:37 +0200 + nexus (4.3.2-svn1921-1) unstable; urgency=low * disginguish between static and dynamic linking, fix diff -Nru nexus-4.3.2-svn1921/debian/rules nexus-4.3.2-svn1921/debian/rules --- nexus-4.3.2-svn1921/debian/rules 2014-04-16 22:00:58.000000000 +0200 +++ nexus-4.3.2-svn1921/debian/rules 2014-07-31 11:11:55.000000000 +0200 @@ -19,6 +19,12 @@ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),) + HDF5_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial +else + HDF5_DIR := /usr +endif + # shared library versions, option 1 #version=2.0.5 #major=2 @@ -41,7 +47,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-hdf5=/usr CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" --with-java-home=/usr/lib/jvm/default-java --with-python=/usr JAVACFLAGS="-source 1.5 -target 1.5" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-hdf5=$(HDF5_DIR) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" --with-java-home=/usr/lib/jvm/default-java --with-python=/usr JAVACFLAGS="-source 1.5 -target 1.5" sed < libtool > libtool-2 -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' mv libtool-2 libtool chmod 755 libtool @@ -57,11 +63,11 @@ $(MAKE) touch $@ -clean: config.status +clean: dh_testdir dh_testroot rm -f build-stamp - $(MAKE) maintainer-clean + -$(MAKE) maintainer-clean rm -f config.sub config.guess rm -fr config || true rm -fr .pc || true