[med-svn] r9716 - trunk/packages/minc/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2012-02-19 17:07:21 +0000 (Sun, 19 Feb 2012)
New Revision: 9716

Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/compat
   trunk/packages/minc/trunk/debian/control
   trunk/packages/minc/trunk/debian/rules
Log:
Switch to (serial) libhdf5-dev, to avoid conflict with serial netcdf.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2012-02-19 15:48:17 UTC (rev 9715)
+++ trunk/packages/minc/trunk/debian/changelog	2012-02-19 17:07:21 UTC (rev 9716)
@@ -1,3 +1,13 @@
+minc (2.1.00-3) unstable; urgency=low
+
+  * control: Switch to (serial) libhdf5-dev, to avoid conflict with serial
+    netcdf.  Closes: #658307.
+  
+  * control:
+  * rules: Switch from cdbs to debhelper's dh (compat level 9).
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 19 Feb 2012 08:53:04 -0600
+
 minc (2.1.00-2) unstable; urgency=low
 
   * patches/decompress-whole-file.diff: New.  Always decompress entire

Modified: trunk/packages/minc/trunk/debian/compat
===================================================================
--- trunk/packages/minc/trunk/debian/compat	2012-02-19 15:48:17 UTC (rev 9715)
+++ trunk/packages/minc/trunk/debian/compat	2012-02-19 17:07:21 UTC (rev 9716)
@@ -1 +1 @@
-5
+9
\ No newline at end of file

Modified: trunk/packages/minc/trunk/debian/control
===================================================================
--- trunk/packages/minc/trunk/debian/control	2012-02-19 15:48:17 UTC (rev 9715)
+++ trunk/packages/minc/trunk/debian/control	2012-02-19 17:07:21 UTC (rev 9716)
@@ -4,8 +4,8 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), csh, libnetcdf-dev, zlib1g-dev, texlive-latex-base,
-  libhdf5-mpi-dev
+Build-Depends: debhelper (>= 9), csh, libnetcdf-dev, zlib1g-dev, texlive-latex-base,
+  libhdf5-dev
 Standards-Version: 3.8.0.0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/minc/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/minc/trunk/?rev=0&sc=0

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2012-02-19 15:48:17 UTC (rev 9715)
+++ trunk/packages/minc/trunk/debian/rules	2012-02-19 17:07:21 UTC (rev 9716)
@@ -1,10 +1,8 @@
 #! /usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh $@ --parallel --with autotools_dev
 
-CFLAGS = -I/usr/include/mpi
 
 # This should fix #368263
 ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -12,27 +10,22 @@
 	CFLAGS += -mieee
 endif
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="$(CFLAGS)"
-DEB_MAKE_BUILD_TARGET = all 
-#DEB_MAKE_CHECK_TARGET = check
 
-ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps
 
-build/libminc-dev:: $(ps_docs)
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
+ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps
+
 doc/prog_ref.ps doc/prog_guide.ps:
 	$(MAKE) -C doc docs
 
 volume_io/Documentation/volume_io.ps:
 	$(MAKE) -C volume_io/Documentation docs
 
-install/minc-tools::
-	rm -f debian/tmp/usr/bin/mincexample?
+override_dh_install: $(ps_docs)
+	# minc-tools
 	rm -f debian/tmp/usr/bin/byte_swap
 	rm -f debian/tmp/usr/bin/extract
 	rm -f debian/tmp/usr/bin/acr_test
@@ -42,12 +35,10 @@
 	dh_link -pminc-tools \
 		/usr/share/man/man1/voxeltoworld.1 \
 		/usr/share/man/man1/worldtovoxel.1
-
-install/libminc2-1::
-	dh_install -plibminc2-1 --autodest debian/tmp/usr/lib/lib*.so.*
-
-install/libminc-dev::
-	dh_install -plibminc-dev --autodest debian/tmp/usr/lib/lib*.so
-	dh_install -plibminc-dev --autodest  debian/tmp/usr/lib/lib*.a
+	# libminc2-1
+	dh_install -plibminc2-1 --autodest debian/tmp/usr/lib/*/lib*.so.*
+	# libminc-dev
+	dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so
+	dh_install -plibminc-dev --autodest  debian/tmp/usr/lib/*/lib*.a
 	dh_install -plibminc-dev --autodest  debian/tmp/usr/include
 	dh_installdocs -plibminc-dev $(ps_docs) debian/index.html