Source: nexus
Version: 4.3.2-svn1921-1
Severity: important
Tags: patch
User: p...@debian.org
Usertags: HDF5-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
The hdf5 1.8.13 package in experimental features a new layout for
headers and libraries, so that all the binary packages are now
co-installable.
Please find attached a patch proposal to support both the current
and the new layouts.
Because this bug is in the way of the hdf5 transition I intend to NMU
in a few days. I apologize for the urge, and I hope this approach won't
offend you. Please tell me otherwise.
Kind regards,
_g.
- -- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBCAAGBQJT2sa4AAoJEO/obGx//s+D/s4H/iRRgdl0cyyiB0QIsi6To/Lz
ioXdBzl4yA4OGtBIHbmppYAjAbb0gqtpvEfRcHyVnfzAJ+7v+hc4F4iAd53J6ZlN
0JwgiG6MUjTRnuUHcCBjy4xWzTLQ8pnXb08r5Ql/L75X2siILMM8fKFjcGjaGmNE
C8Zh1LFKhuK/S2J4MkVjEJ/dnfRToKvQJB3UntltTl20wq5qTRuELa9IiTNi/rXg
h0yeaAoXg2IzBavyHK+02GXBN5O2um4lfns36v2WksidmWVgXnwFBoDOJBrcMkNI
OnGjkuO1gUOmGJktHGUEiE7pvZ3HjSc0y/sn2jYuDzx7+q7PvCmyDD+Sj6SVXQQ=
=Pw8U
-----END PGP SIGNATURE-----
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 <p...@debian.org> 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
