Source: mapsembler2
Version: 2.2.1+dfsg-2
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

Please find attached a patch to support the hdf5 1.8.13 new packaging
layout currently in experimental. BTW this patch also fixes an FTBFS
related to a help2man invokation in debian/rules.

Because this bug is in the way of the upcoming hdf5 transition I intend
to NMU in a few days. Please tell me if you prefer uploading the fix
by yourself.

Many thanks in advance,

_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

iQEcBAEBCAAGBQJT9NgvAAoJEO/obGx//s+DU0cH/A+rYFLpMV7nTRtxxczk98yP
YW/ykzU2DxxGj4z5LqvN2/0xs/3H7U4vtW2kWCj1GhurXNb45NDcb4FflWzyRXkJ
iC4WDEV26ZsoCTC55z3jxUqTEknwK1aAfJM9Q81nhXfDgg45XjMbY5oV9Ond1W7w
xMiR9jgK/jse0Nbtvzv8InDzwbxNDvTWMgK30IzwTENGWEF87/b/yRd1HXJra2IG
rqu3sr6kT4CJEtR+wmlMDaQbQbniiFQHmUfr59YUi3FD5O2kFQvMLfuOjaA4FccB
cW+6KpYSpW0Tz9hs9VxxxUGFbS8o8R7oq+otldrpfSq+oicrlZVk+WB+aILvH4s=
=bVjs
-----END PGP SIGNATURE-----
diff -Nru mapsembler2-2.2.1+dfsg/debian/changelog mapsembler2-2.2.1+dfsg/debian/changelog
--- mapsembler2-2.2.1+dfsg/debian/changelog	2014-08-20 08:49:24.000000000 +0200
+++ mapsembler2-2.2.1+dfsg/debian/changelog	2014-08-20 12:23:12.000000000 +0200
@@ -1,3 +1,11 @@
+mapsembler2 (2.2.1+dfsg-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * Fix FTBFS due to broken help2man call in debian/rules.
+
+ -- Gilles Filippini <[email protected]>  Wed, 20 Aug 2014 12:21:26 +0200
+
 mapsembler2 (2.2.1+dfsg-2) unstable; urgency=medium
 
   * Fix kissreads file conflict with discoSnp (Closes: #758648).
diff -Nru mapsembler2-2.2.1+dfsg/debian/rules mapsembler2-2.2.1+dfsg/debian/rules
--- mapsembler2-2.2.1+dfsg/debian/rules	2014-08-20 08:42:14.000000000 +0200
+++ mapsembler2-2.2.1+dfsg/debian/rules	2014-08-20 12:21:07.000000000 +0200
@@ -5,6 +5,11 @@
 
 SRC_VERSION =$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
 
+ifneq ($(wildcard /usr/include/hdf5/serial),)
+  export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
+  export DEB_LDFLAGS_MAINT_APPEND := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -44,6 +49,6 @@
 	mv ./kissreads_graph/kissreads_graph ./kissreads_graph/mapsembler2_kissreads_graph
 	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./kissreads_graph/mapsembler2_kissreads_graph > mapsembler2_kissreads_graph.1
 	cp run_mapsembler2_pipeline.sh run_mapsembler2_pipeline
-	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) run_mapsembler2_pipeline > run_mapsembler2_pipeline.1
+	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./run_mapsembler2_pipeline > run_mapsembler2_pipeline.1
 	dh_install
 

Reply via email to