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

[Steven Michael Robbins]

Author: smr
Date: 2012-10-14 05:27:39 +0000 (Sun, 14 Oct 2012)
New Revision: 12414

Added:
   trunk/packages/minc/trunk/debian/patches/acrnema-version.patch
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/patches/makefile.patch
   trunk/packages/minc/trunk/debian/patches/series
   trunk/packages/minc/trunk/debian/rules
Log:
Add proper versioning to libacr_nema, build --with autoreconf.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2012-10-14 05:23:24 UTC (rev 12413)
+++ trunk/packages/minc/trunk/debian/changelog	2012-10-14 05:27:39 UTC (rev 12414)
@@ -2,8 +2,13 @@
 
   * New upstream.
   * patches/hdfv2-fixes.patch: Remove.  Applied upstream.
+
   * patches/makefile.patch: New.  Fix build failure.
-  
+  * patches/acrnema-version.patch: New.  Add proper versioning to
+    libacr_nema.
+
+  * rules: Use "--with autoreconf" since new patches affect Makefile.am.
+
   * rules:  
   * control: SOVERSION bump to 3; new package name libminc2-3.
 

Added: trunk/packages/minc/trunk/debian/patches/acrnema-version.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/acrnema-version.patch	                        (rev 0)
+++ trunk/packages/minc/trunk/debian/patches/acrnema-version.patch	2012-10-14 05:27:39 UTC (rev 12414)
@@ -0,0 +1,10 @@
+--- minc-2.2.00.orig/Makefile.am
++++ minc-2.2.00/Makefile.am
+@@ -555,6 +555,7 @@
+ 	volume_io/Volumes/volume_cache.c \
+ 	volume_io/Volumes/volumes.c
+ 
++libacr_nema_la_LDFLAGS = -version-info 3:0:0
+ libacr_nema_la_SOURCES = \
+ 	conversion/Acr_nema/acr_io.c \
+ 	conversion/Acr_nema/dicom_client_routines.c \

Modified: trunk/packages/minc/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/minc/trunk/debian/patches/makefile.patch	2012-10-14 05:23:24 UTC (rev 12413)
+++ trunk/packages/minc/trunk/debian/patches/makefile.patch	2012-10-14 05:27:39 UTC (rev 12414)
@@ -54,35 +54,3 @@
  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-14 05:23:24 UTC (rev 12413)
+++ trunk/packages/minc/trunk/debian/patches/series	2012-10-14 05:27:39 UTC (rev 12414)
@@ -1,2 +1,3 @@
 makefile.patch
 01_mincedit-sensible-viewer.diff
+acrnema-version.patch

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2012-10-14 05:23:24 UTC (rev 12413)
+++ trunk/packages/minc/trunk/debian/rules	2012-10-14 05:27:39 UTC (rev 12414)
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
 %:
-	dh $@ --parallel --with autotools_dev
+	dh $@ --parallel --with autoreconf --with autotools_dev
 
 
 ARCH  := $(shell dpkg-architecture -qDEB_BUILD_ARCH)