Source: xmds2
Version: 2.2.0+dfsg1-2
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

iQEcBAEBCAAGBQJT2sk7AAoJEO/obGx//s+Do2UH/1CdVUd2SVp5wxwzLsxa1P9O
LeeNMaO9jjK5Qjn6BYHU2zKm4iYKPbBGw9LatPs752YtMQ/+M9FmZOSrUeL+SZgB
zQfHSvughvotFJvhU3o9VTAt7qKvadYPAmV9fga19zTXp3PUvnNvDmpWHEy788vU
fmHLu0zIIFstu0AEYLWkWuAm7y4B7pxCXyQ4kotsmovjaWmk9EhiMAGd57ubUgpI
UXfqmnNoQuE0+ISM1iKtthudwKC+EfRylt5fQcC2BPqv3VKz6HZdbSYNtaRzvQXM
qelgIW1enCPNpia6cA5C+xhnBQwyF3bRdzTsH1FkyP1M5qIk3AFoFJP4S1E32ck=
=rvKb
-----END PGP SIGNATURE-----
diff -Nru xmds2-2.2.0+dfsg1/debian/changelog xmds2-2.2.0+dfsg1/debian/changelog
--- xmds2-2.2.0+dfsg1/debian/changelog	2014-04-09 20:04:41.000000000 +0200
+++ xmds2-2.2.0+dfsg1/debian/changelog	2014-07-26 20:14:09.000000000 +0200
@@ -1,3 +1,10 @@
+xmds2 (2.2.0+dfsg1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <p...@debian.org>  Sat, 26 Jul 2014 20:14:09 +0200
+
 xmds2 (2.2.0+dfsg1-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru xmds2-2.2.0+dfsg1/debian/rules xmds2-2.2.0+dfsg1/debian/rules
--- xmds2-2.2.0+dfsg1/debian/rules	2014-04-09 20:04:01.000000000 +0200
+++ xmds2-2.2.0+dfsg1/debian/rules	2014-07-31 18:57:05.000000000 +0200
@@ -3,6 +3,11 @@
 
 XMDS_USER_DATA = $(CURDIR)/debian/xmds-user-data
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  HDF5_PATHS := --include-path=/usr/include/hdf5/serial \
+	--lib-path=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 #DH_VERBOSE=1
 
 %:
@@ -19,7 +24,7 @@
           export OMPI_MCA_plm_rsh_agent=/bin/false ;	\
 	  mkdir bin-test ;				\
 	  install -m 755 bin/* bin-test ; 		\
-	  xmds2 --reconfigure ;				\
+	  xmds2 --reconfigure $(HDF5_PATHS) ;		\
 	  ./run_tests.py ;				\
 	  cd ./examples ;				\
 	  xmds2 lorenz.xmds ;				\
-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to