[med-svn] r17808 - trunk/packages/mapsembler2/trunk/debian

[Olivier Sallou]

Author: osallou
Date: 2014-08-21 06:07:40 +0000 (Thu, 21 Aug 2014)
New Revision: 17808

Modified:
   trunk/packages/mapsembler2/trunk/debian/changelog
   trunk/packages/mapsembler2/trunk/debian/rules
Log:
prepare hdf5 transition, fix bug on help2man

Modified: trunk/packages/mapsembler2/trunk/debian/changelog
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/changelog	2014-08-20 13:22:47 UTC (rev 17807)
+++ trunk/packages/mapsembler2/trunk/debian/changelog	2014-08-21 06:07:40 UTC (rev 17808)
@@ -1,3 +1,11 @@
+mapsembler2 (2.2.1+dfsg-3) unstable; urgency=medium
+
+  [Gilles Filippini <pini at debian.org> ]
+  * Support hdf5 1.8.13 new packaging layout (Closes: #758730).
+  * Fix FTBFS due to broken help2man call in debian/rules.
+
+ -- Olivier Sallou <osallou at debian.org>  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).

Modified: trunk/packages/mapsembler2/trunk/debian/rules
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/rules	2014-08-20 13:22:47 UTC (rev 17807)
+++ trunk/packages/mapsembler2/trunk/debian/rules	2014-08-21 06:07:40 UTC (rev 17808)
@@ -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