[med-svn] r9795 - in trunk/packages/minc/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2012-02-26 07:59:19 +0000 (Sun, 26 Feb 2012)
New Revision: 9795

Added:
   trunk/packages/minc/trunk/debian/patches/hdfv2-fixes.patch
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/control
   trunk/packages/minc/trunk/debian/patches/series
   trunk/packages/minc/trunk/debian/rules
Log:
Updates for new upstream.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2012-02-26 07:06:39 UTC (rev 9794)
+++ trunk/packages/minc/trunk/debian/changelog	2012-02-26 07:59:19 UTC (rev 9795)
@@ -1,3 +1,20 @@
+minc (2.1.10-1) unstable; urgency=low
+
+  * New upstream.
+  
+  * patches/03_mincview.diff: Remove.  Script mincview rewritten to use
+    Imagemagick
+  
+  * patches/decompress-whole-file.diff:
+  * patches/read_file_names-refactor.patch: Remove.  Applied upstream.
+  * rules: Remove use of dh_autoreconf.
+
+  * patches/hdfv2-fixes.patch: New.  Ensure using HDF5 v2 API.
+  
+  * control: Remove dependency and build-dependency on csh.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 26 Feb 2012 01:37:47 -0600
+
 minc (2.1.00-5) unstable; urgency=low
 
   * patches/mincaverage-pathmax.patch: Remove.

Modified: trunk/packages/minc/trunk/debian/control
===================================================================
--- trunk/packages/minc/trunk/debian/control	2012-02-26 07:06:39 UTC (rev 9794)
+++ trunk/packages/minc/trunk/debian/control	2012-02-26 07:59:19 UTC (rev 9795)
@@ -4,7 +4,7 @@
 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: debhelper (>= 9), autotools-dev, dh-autoreconf, csh, 
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf,
   libnetcdf-dev, zlib1g-dev, texlive-latex-base, libhdf5-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/minc/trunk/
@@ -12,7 +12,7 @@
 
 Package: minc-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, csh | c-shell, netcdf-bin, libgetopt-tabular-perl, libtext-format-perl, imagemagick
+Depends: ${shlibs:Depends}, ${misc:Depends}, netcdf-bin, libgetopt-tabular-perl, libtext-format-perl, imagemagick
 Description: MNI medical image format tools
  This package contains tools to manipulate MINC files.
  .

Added: trunk/packages/minc/trunk/debian/patches/hdfv2-fixes.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/hdfv2-fixes.patch	                        (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/hdfv2-fixes.patch	2012-02-26 07:59:19 UTC (rev 9795)
@@ -0,0 +1,17 @@
+Description: Enable building with HDF5 1.8
+ Fix build problems with HDF5 version 2 API.
+Author: Steve Robbins <smr at debian.org>
+Bug: n/a
+Forwarded: no
+
+--- minc-2.1.10.orig/libsrc2/test/datatype-test.c
++++ minc-2.1.10/libsrc2/test/datatype-test.c
+@@ -13,7 +13,7 @@
+ 
+     /* Turn off automatic error reporting.
+      */
+-    H5Eset_auto(H5E_DEFAULT, NULL);
++    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+ 
+     /* Check each file.
+      */

Modified: trunk/packages/minc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/trunk/debian/patches/series	2012-02-26 07:06:39 UTC (rev 9794)
+++ trunk/packages/minc/trunk/debian/patches/series	2012-02-26 07:59:19 UTC (rev 9795)
@@ -1 +1,2 @@
 01_mincedit-sensible-viewer.diff
+hdfv2-fixes.patch

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2012-02-26 07:06:39 UTC (rev 9794)
+++ trunk/packages/minc/trunk/debian/rules	2012-02-26 07:59:19 UTC (rev 9795)
@@ -16,13 +16,8 @@
 
 
 override_dh_auto_configure:
-	dh_autoreconf
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
-override_dh_auto_clean:
-	dh_autoreconf_clean
-	dh_auto_clean
-
 ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps
 
 doc/prog_ref.ps doc/prog_guide.ps: