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

[smr at alioth.debian.org]

Author: smr
Date: 2007-12-31 19:22:31 +0000 (Mon, 31 Dec 2007)
New Revision: 1056

Added:
   trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/control
   trunk/packages/minc/trunk/debian/rules
Log:
New upstream version, 2.0.14, built with minc2 and acr-nema enabled.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2007-12-30 22:47:25 UTC (rev 1055)
+++ trunk/packages/minc/trunk/debian/changelog	2007-12-31 19:22:31 UTC (rev 1056)
@@ -1,5 +1,20 @@
-minc (1.5-2) unstable; urgency=low
+minc (2.0.14-1) unstable; urgency=low
 
+  * New upstream version.  Closes: #450922.
+  
+  * control: Add build-depends for libhdf5-serial-dev, texlive-latex-base.
+    Rename package libminc0 --> libminc2-1.
+    Rename package libminc0-dev --> libminc-dev.
+    Package libminc-dev depends on libhdf5-serial-dev.
+  
+  * patches/02_testdir-runtests.diff: New.  Fix test scripts.
+  
+  * rules: Configure with --enable-minc2 and --enable-acr-nema.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 29 Dec 2007 15:20:53 -0600
+
+minc (1.5-2) NEVER UPLOADED; urgency=low
+
   * Rewrite build system using cdbs.
     - patches/01_mincedit-sensible-viewer.diff: New.  Obtained from
       existing Debian diff.
@@ -10,7 +25,7 @@
     for libminc0-dev dependency on libminc0.  Add Homepage and Vcs-Svn
     header fields.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 29 Dec 2007 08:50:45 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sat, 29 Dec 2007 15:10:53 -0600
 
 minc (1.5-1) unstable; urgency=low
 

Modified: trunk/packages/minc/trunk/debian/control
===================================================================
--- trunk/packages/minc/trunk/debian/control	2007-12-30 22:47:25 UTC (rev 1055)
+++ trunk/packages/minc/trunk/debian/control	2007-12-31 19:22:31 UTC (rev 1056)
@@ -3,7 +3,7 @@
 Section: science
 Priority: optional
 Maintainer: Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), csh, netcdfg-dev, texlive-latex-base | tetex-bin
+Build-Depends: cdbs, debhelper (>= 5), csh, netcdfg-dev, libhdf5-serial-dev, zlib1g-dev, texlive-latex-base | tetex-bin
 Standards-Version: 3.7.3.0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/minc/trunk
 
@@ -23,15 +23,17 @@
  simple and powerful and make no attempt to provide a pretty interface
  to users.
 
-Package: libminc0
+Package: libminc2-1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: MNI medical image format library
- This package contains the libraries libminc and libvolume_io.
+ This package contains the libraries libminc2 and libvolume_io2.
  .
- The Minc file format is a highly flexible medical image file format
- built on top of the NetCDF generalized data format. The format is
+ The Minc file format is a highly flexible medical image file format.
+ Minc version 1 is built on top of the NetCDF generalized data format. 
+ Minc version 2 is built on top of the HDF data format.  This library
+ handles both formats.  In each case the format is
  simple, self-describing, extensible, portable and N-dimensional, with
  programming interfaces for both low-level data access and high-level
  volume manipulation. On top of the libraries is a suite of generic
@@ -40,18 +42,19 @@
  simple and powerful and make no attempt to provide a pretty interface
  to users.
 
-Package: libminc0-dev
-Provides: libminc-dev
-Conflicts: libminc-dev
+Package: libminc-dev
+Conflicts: libminc0-dev
 Section: libdevel
 Architecture: any
-Depends: libminc0 (= ${binary:Version}), netcdfg-dev
+Depends: libminc2-1 (= ${binary:Version}), netcdfg-dev, libhdf5-serial-dev
 Description: MNI medical image format development environment
- This package contains the library and headers for libminc and
- libvolume_io.
+ This package contains the library and headers for libminc2 and
+ libvolume_io2.
  .
- The Minc file format is a highly flexible medical image file format
- built on top of the NetCDF generalized data format. The format is
+ The Minc file format is a highly flexible medical image file format.
+ Minc version 1 is built on top of the NetCDF generalized data format. 
+ Minc version 2 is built on top of the HDF data format.  This library
+ handles both formats.  In each case the format is
  simple, self-describing, extensible, portable and N-dimensional, with
  programming interfaces for both low-level data access and high-level
  volume manipulation. On top of the libraries is a suite of generic

Added: trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff	                        (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff	2007-12-31 19:22:31 UTC (rev 1056)
@@ -0,0 +1,24 @@
+diff -u -r tarballs/minc-2.0.14/testdir/run_test2.sh build-area/minc-2.0.14/testdir/run_test2.sh
+--- tarballs/minc-2.0.14/testdir/run_test2.sh	2007-05-17 11:56:08.000000000 -0500
++++ build-area/minc-2.0.14/testdir/run_test2.sh	2007-12-31 08:45:42.000000000 -0600
+@@ -2,7 +2,7 @@
+ 
+ set -e
+ 
+-tests=minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue
++tests="minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue"
+ 
+ for test in $tests;
+ do
+diff -u -r tarballs/minc-2.0.14/testdir/run_tests.sh build-area/minc-2.0.14/testdir/run_tests.sh
+--- tarballs/minc-2.0.14/testdir/run_tests.sh	2007-05-17 11:56:08.000000000 -0500
++++ build-area/minc-2.0.14/testdir/run_tests.sh	2007-12-31 08:39:27.000000000 -0600
+@@ -2,7 +2,7 @@
+ 
+ set -e
+ 
+-tests=minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue
++tests="minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue"
+ 
+ for test in $tests;
+ do

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2007-12-30 22:47:25 UTC (rev 1055)
+++ trunk/packages/minc/trunk/debian/rules	2007-12-31 19:22:31 UTC (rev 1056)
@@ -4,12 +4,10 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema
 DEB_MAKE_BUILD_TARGET = all 
 DEB_MAKE_CHECK_TARGET = check
 
-#DEB_MAKE_INVOKE += moduledir=/usr/lib/geomview
-
 ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps
 
 build/libminc0-dev:: $(ps_docs)