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

[Steven Michael Robbins]

Author: smr
Date: 2012-10-14 03:45:46 +0000 (Sun, 14 Oct 2012)
New Revision: 12404

Added:
   trunk/packages/minc/trunk/debian/patches/makefile.patch
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/control
   trunk/packages/minc/trunk/debian/patches/series
Log:
Patch Makefile to fix build.  Update package name for new SOVERSION.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2012-10-13 09:02:00 UTC (rev 12403)
+++ trunk/packages/minc/trunk/debian/changelog	2012-10-14 03:45:46 UTC (rev 12404)
@@ -2,8 +2,11 @@
 
   * New upstream.
   * patches/hdfv2-fixes.patch: Remove.  Applied upstream.
+  * patches/makefile.patch: New.  Fix build failure.
+  
+  * control: SOVERSION bump to 3; new package name libminc2-3.
 
- -- Steve M. Robbins <smr at debian.org>  Thu, 11 Oct 2012 21:21:09 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 13 Oct 2012 22:43:10 -0500
 
 minc (2.1.10-1) unstable; urgency=low
 

Modified: trunk/packages/minc/trunk/debian/control
===================================================================
--- trunk/packages/minc/trunk/debian/control	2012-10-13 09:02:00 UTC (rev 12403)
+++ trunk/packages/minc/trunk/debian/control	2012-10-14 03:45:46 UTC (rev 12404)
@@ -26,7 +26,7 @@
  simple and powerful and make no attempt to provide a pretty interface
  to users.
 
-Package: libminc2-1
+Package: libminc2-3
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -52,7 +52,7 @@
 Replaces: libminc0-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libminc2-1 (= ${binary:Version}), libnetcdf-dev, libhdf5-dev
+Depends: ${misc:Depends}, libminc2-3 (= ${binary:Version}), libnetcdf-dev, libhdf5-dev
 Description: MNI medical image format development environment
  This package contains the library and headers for libminc2 and
  libvolume_io2.

Added: trunk/packages/minc/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/makefile.patch	                        (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/makefile.patch	2012-10-14 03:45:46 UTC (rev 12404)
@@ -0,0 +1,88 @@
+--- minc-2.2.00.orig/Makefile.am
++++ minc-2.2.00/Makefile.am
+@@ -274,30 +274,30 @@
+ 	m4/smr_WITH_BUILD_PATH.m4
+ 
+ ezMINC_files = \
+-	ezminc/examples/volume_msq_dist.cpp
+-	ezminc/examples/CMakeLists.txt
+-	ezminc/examples/fuzzy_volume_similarity.cpp
+-	ezminc/examples/trilinear_resample.cpp
+-	ezminc/examples/volume_avg.cpp
+-	ezminc/examples/volume_gtc_similarity.cpp
+-	ezminc/examples/volume_similarity.cpp
+-	ezminc/minc_1_simple_rw.cpp
+-	ezminc/minc_1_simple_rw.h
+-	ezminc/minc_io_4d_volume.h
+-	ezminc/minc_io_fixed_vector.h
+-	ezminc/minc_io_simple_volume.h
+-	ezminc/tests/minc_rw_test2.cpp
+-	ezminc/tests/minc_rw_test_4d.cpp
+-	ezminc/tests/minc_rw_test_simple.cpp
+-	ezminc/tests/CMakeLists.txt
+-	ezminc/tests/ezminc_rw_test.cpp
+-	ezminc/tests/ezminc_stats.cpp
+-	ezminc/minc_1_simple.h
+-	ezminc/CMakeLists.txt
+-	ezminc/minc_1_rw.cpp
+-	ezminc/minc_1_rw.h
++	ezminc/examples/volume_msq_dist.cpp \
++	ezminc/examples/CMakeLists.txt \
++	ezminc/examples/fuzzy_volume_similarity.cpp \
++	ezminc/examples/trilinear_resample.cpp \
++	ezminc/examples/volume_avg.cpp \
++	ezminc/examples/volume_gtc_similarity.cpp \
++	ezminc/examples/volume_similarity.cpp \
++	ezminc/minc_1_simple_rw.cpp \
++	ezminc/minc_1_simple_rw.h \
++	ezminc/minc_io_4d_volume.h \
++	ezminc/minc_io_fixed_vector.h \
++	ezminc/minc_io_simple_volume.h \
++	ezminc/tests/minc_rw_test2.cpp \
++	ezminc/tests/minc_rw_test_4d.cpp \
++	ezminc/tests/minc_rw_test_simple.cpp \
++	ezminc/tests/CMakeLists.txt \
++	ezminc/tests/ezminc_rw_test.cpp \
++	ezminc/tests/ezminc_stats.cpp \
++	ezminc/minc_1_simple.h \
++	ezminc/CMakeLists.txt \
++	ezminc/minc_1_rw.cpp \
++	ezminc/minc_1_rw.h \
+ 	ezminc/minc_io_exceptions.h
+-	
++
+ voxeltoworld_SOURCES = progs/coordinates/voxeltoworld.c
+ 
+ worldtovoxel_SOURCES = progs/coordinates/worldtovoxel.c
+--- minc-2.2.00.orig/Makefile.in
++++ minc-2.2.00/Makefile.in
+@@ -3460,28 +3460,7 @@
+ 	$(POD2MAN) --section=1 $< > $@
+ progs/mincpik/mincpik.man1: progs/mincpik/mincpik
+ 	$(POD2MAN) --section=1 $< > $@
+-	ezminc/examples/CMakeLists.txt
+-	ezminc/examples/fuzzy_volume_similarity.cpp
+-	ezminc/examples/trilinear_resample.cpp
+-	ezminc/examples/volume_avg.cpp
+-	ezminc/examples/volume_gtc_similarity.cpp
+-	ezminc/examples/volume_similarity.cpp
+-	ezminc/minc_1_simple_rw.cpp
+-	ezminc/minc_1_simple_rw.h
+-	ezminc/minc_io_4d_volume.h
+-	ezminc/minc_io_fixed_vector.h
+-	ezminc/minc_io_simple_volume.h
+-	ezminc/tests/minc_rw_test2.cpp
+-	ezminc/tests/minc_rw_test_4d.cpp
+-	ezminc/tests/minc_rw_test_simple.cpp
+-	ezminc/tests/CMakeLists.txt
+-	ezminc/tests/ezminc_rw_test.cpp
+-	ezminc/tests/ezminc_stats.cpp
+-	ezminc/minc_1_simple.h
+-	ezminc/CMakeLists.txt
+-	ezminc/minc_1_rw.cpp
+-	ezminc/minc_1_rw.h
+-	ezminc/minc_io_exceptions.h
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: trunk/packages/minc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/trunk/debian/patches/series	2012-10-13 09:02:00 UTC (rev 12403)
+++ trunk/packages/minc/trunk/debian/patches/series	2012-10-14 03:45:46 UTC (rev 12404)
@@ -1 +1,2 @@
+makefile.patch
 01_mincedit-sensible-viewer.diff