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

[Steven Michael Robbins]

Author: smr
Date: 2015-09-13 00:34:33 +0000 (Sun, 13 Sep 2015)
New Revision: 20056

Modified:
   trunk/packages/minc/libminc/trunk/debian/changelog
   trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
   trunk/packages/minc/libminc/trunk/debian/patches/series
   trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti
Log:
Adjust changelog and patches for the official release 2.3.00 tarball.

Modified: trunk/packages/minc/libminc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/changelog	2015-09-12 05:52:55 UTC (rev 20055)
+++ trunk/packages/minc/libminc/trunk/debian/changelog	2015-09-13 00:34:33 UTC (rev 20056)
@@ -1,10 +1,10 @@
-libminc (2.3.00~2015-08-24-1) unstable; urgency=medium
+libminc (2.3.00-1) unstable; urgency=medium
 
   * New upstream.  Contains library source only.  New minc-tools source
-    package will build minc-tools.  Source tarball retrieved from github
-    develop branch on 2015-08-24.
+    package will build minc-tools.
+    - Fixed to build with NetCDF 4.4.  Closes: #793885.
 
- -- Steve M. Robbins <smr at debian.org>  Thu, 03 Sep 2015 05:32:00 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 12 Sep 2015 19:20:21 -0500
 
 minc (2.2.00-6) unstable; urgency=medium
 

Modified: trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake	2015-09-12 05:52:55 UTC (rev 20055)
+++ trunk/packages/minc/libminc/trunk/debian/patches/fix-uselibminc-cmake	2015-09-13 00:34:33 UTC (rev 20056)
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f23bf1..03a6468 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -418,7 +418,7 @@ configure_file(UseLIBMINC.cmake.in
+--- libminc-2.3.00.orig/CMakeLists.txt
++++ libminc-2.3.00/CMakeLists.txt
+@@ -420,7 +420,7 @@
    ${CMAKE_CURRENT_BINARY_DIR}/UseLIBMINC.cmake @ONLY)
  
  # config for install dir

Modified: trunk/packages/minc/libminc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/series	2015-09-12 05:52:55 UTC (rev 20055)
+++ trunk/packages/minc/libminc/trunk/debian/patches/series	2015-09-13 00:34:33 UTC (rev 20056)
@@ -1,4 +1,3 @@
 build-using-system-find-dot-cmake
-fix-soversion-generation
 fix-uselibminc-cmake
 use-system-nifti

Modified: trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti	2015-09-12 05:52:55 UTC (rev 20055)
+++ trunk/packages/minc/libminc/trunk/debian/patches/use-system-nifti	2015-09-13 00:34:33 UTC (rev 20056)
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03a6468..cf8da19 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -171,8 +171,8 @@ INCLUDE_DIRECTORIES(
+--- libminc-2.3.00.orig/CMakeLists.txt
++++ libminc-2.3.00/CMakeLists.txt
+@@ -172,8 +172,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/libsrc
     ${CMAKE_CURRENT_SOURCE_DIR}/volume_io/Include
     ${CMAKE_CURRENT_SOURCE_DIR}/ezminc
@@ -12,16 +10,17 @@
     )
  
  SET(minc_common_SRCS
-@@ -188,8 +188,6 @@ SET(minc_common_HEADERS
+@@ -189,9 +189,6 @@
    libsrc/read_file_names.h
    libsrc/restructure.h
    volume_io/Include/volume_io.h
 -  nifti/nifti1.h
 -  nifti/nifti1_io.h
+-  nifti/znzlib.h
  )
  
  # some variables
-@@ -282,8 +280,6 @@ SET(volume_io_LIB_SRCS
+@@ -284,8 +281,6 @@
     volume_io/Volumes/output_mnc2.c
     volume_io/Volumes/input_mgh.c
     volume_io/Volumes/input_nifti.c
@@ -30,7 +29,7 @@
  )
  
  SET(volume_io_HEADERS
-@@ -343,7 +339,7 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
+@@ -345,7 +340,7 @@
  EXPORT(TARGETS ${LIBMINC_LIBRARY} FILE "${LIBMINC_EXPORTED_TARGETS}.cmake")
  
  IF(UNIX)
@@ -39,7 +38,7 @@
  
    IF(LIBMINC_BUILD_SHARED_LIBS)
      ADD_LIBRARY(${LIBMINC_LIBRARY_STATIC} STATIC ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
-@@ -391,7 +387,6 @@ SET(LIBMINC_INCLUDE_DIRS_CONFIG
+@@ -393,7 +388,6 @@
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/libsrc2
    ${CMAKE_CURRENT_SOURCE_DIR}/volume_io/Include