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

[smr at alioth.debian.org]

Author: smr
Date: 2008-10-12 04:12:21 +0000 (Sun, 12 Oct 2008)
New Revision: 2566

Removed:
   trunk/packages/minc/trunk/debian/patches/02_mincedit-no-escape-chars.diff
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/control
   trunk/packages/minc/trunk/debian/rules
Log:
Prepare for upstream release 2.0.16.  Build using libhdf5-mpi rather than -serial.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2008-10-02 09:59:16 UTC (rev 2565)
+++ trunk/packages/minc/trunk/debian/changelog	2008-10-12 04:12:21 UTC (rev 2566)
@@ -1,9 +1,17 @@
-minc (2.0.15-4) UNRELEASED; urgency=low
+minc (2.0.16-1) unstable; urgency=low
 
+  * New upstream release.
+    - debian/patches/02_mincedit-no-escape-chars: Remove.  Applied upstream.
+  
+  * debian/control: Switch build-dep from libhdf5-serial-dev to
+    libhdf5-openmpi-dev.
+  * debian/rules: Add CFLAGS=-I/usr/include/mpi to configure step so that
+    mpi.h is found.
+
   * debian/control: Remove tetex-bin from build-depends (was alternative
     to texlive-latex-base).
 
- -- Steve M. Robbins <smr at debian.org>  Thu, 19 Jun 2008 08:03:51 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 11 Oct 2008 23:10:19 -0500
 
 minc (2.0.15-3) unstable; urgency=low
 

Modified: trunk/packages/minc/trunk/debian/control
===================================================================
--- trunk/packages/minc/trunk/debian/control	2008-10-02 09:59:16 UTC (rev 2565)
+++ trunk/packages/minc/trunk/debian/control	2008-10-12 04:12:21 UTC (rev 2566)
@@ -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: cdbs, debhelper (>= 5), csh, libnetcdf-dev, libhdf5-serial-dev, zlib1g-dev, texlive-latex-base
+Build-Depends: cdbs, debhelper (>= 5), csh, libnetcdf-dev, libhdf5-openmpi-dev, zlib1g-dev, texlive-latex-base
 Standards-Version: 3.7.3.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

Deleted: trunk/packages/minc/trunk/debian/patches/02_mincedit-no-escape-chars.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/02_mincedit-no-escape-chars.diff	2008-10-02 09:59:16 UTC (rev 2565)
+++ trunk/packages/minc/trunk/debian/patches/02_mincedit-no-escape-chars.diff	2008-10-12 04:12:21 UTC (rev 2566)
@@ -1,43 +0,0 @@
-Index: progs/mincedit/mincedit
-===================================================================
-RCS file: /private-cvsroot/minc/progs/mincedit/mincedit,v
-retrieving revision 6.8
-diff -u -b -B -r6.8 mincedit
---- progs/mincedit/mincedit	5 Feb 2008 13:48:45 -0000	6.8
-+++ progs/mincedit/mincedit	18 Jun 2008 03:48:30 -0000
-@@ -80,7 +80,7 @@
- }
- 
- me=`basename $0`
--usage="Usage: $me <minc file> [<editor>]\n"
-+usage="Usage: $me <minc file> [<editor>]"
- 
- # create tmpdir
- tmpdir=${TMPDIR:-/tmp}/mincedit.$$
-@@ -139,7 +139,7 @@
- status=$?
- if [ $status -ne 0 ]
- then
--   echo "${0}: Error reading file '$infile'\n"
-+   echo "${0}: Error reading file '$infile'"
-    exit 1
- fi
- 
-@@ -155,7 +155,7 @@
-    status=$?
-    if [ $status -ne 0 ] 
-    then
--      echo "$me: Error editing with editor '$editor'\n"
-+      echo "$me: Error editing with editor '$editor'"
-       exit 1
-    fi
-    do_edit=0
-@@ -165,7 +165,7 @@
-    status=$?
-    if [ $status -eq 0 ] 
-    then
--      echo "$me: File $infile not modified\n"
-+      echo "$me: File $infile not modified"
-       exit 0
-    fi
-    

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2008-10-02 09:59:16 UTC (rev 2565)
+++ trunk/packages/minc/trunk/debian/rules	2008-10-12 04:12:21 UTC (rev 2566)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="-I/usr/include/mpi"
 DEB_MAKE_BUILD_TARGET = all 
 #DEB_MAKE_CHECK_TARGET = check