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

[Steven Michael Robbins]

Author: smr
Date: 2015-08-25 03:43:05 +0000 (Tue, 25 Aug 2015)
New Revision: 19994

Modified:
   trunk/packages/minc/libminc/trunk/debian/changelog
   trunk/packages/minc/libminc/trunk/debian/control
   trunk/packages/minc/libminc/trunk/debian/patches/build-using-system-find-dot-cmake
   trunk/packages/minc/libminc/trunk/debian/rules
Log:
Update to use latest upstream "develop" branch as source.

Modified: trunk/packages/minc/libminc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/changelog	2015-08-25 03:27:26 UTC (rev 19993)
+++ trunk/packages/minc/libminc/trunk/debian/changelog	2015-08-25 03:43:05 UTC (rev 19994)
@@ -1,10 +1,10 @@
-libminc (2.3.00~2015-08-22-1) unstable; urgency=medium
+libminc (2.3.00~2015-08-24-1) unstable; urgency=medium
 
   * New upstream.  Contains library source only.  New minc-tools source
     package will build minc-tools.  Source tarball retrieved from github
-    master branch.
+    develop branch.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 22 Aug 2015 15:51:17 -0500
+ -- Steve M. Robbins <smr at debian.org>  Mon, 24 Aug 2015 22:30:13 -0500
 
 minc (2.2.00-6) unstable; urgency=medium
 

Modified: trunk/packages/minc/libminc/trunk/debian/control
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/control	2015-08-25 03:27:26 UTC (rev 19993)
+++ trunk/packages/minc/libminc/trunk/debian/control	2015-08-25 03:43:05 UTC (rev 19994)
@@ -14,15 +14,13 @@
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/minc/trunk/
 Homepage: https://github.com/BIC-MNI/libminc
 
-Package: libminc2-3.0.0
+Package: libminc2-4.0.0
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libminc2-3
-Replaces: libminc2-3
 Description: MNI medical image format library
  This package contains the libraries libminc2 and libvolume_io2.
  .
@@ -42,7 +40,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libminc2-3.0.0 (= ${binary:Version}),
+         libminc2-4.0.0 (= ${binary:Version}),
          libnetcdf-dev,
          libhdf5-dev
 Conflicts: libminc0-dev

Modified: trunk/packages/minc/libminc/trunk/debian/patches/build-using-system-find-dot-cmake
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/build-using-system-find-dot-cmake	2015-08-25 03:27:26 UTC (rev 19993)
+++ trunk/packages/minc/libminc/trunk/debian/patches/build-using-system-find-dot-cmake	2015-08-25 03:43:05 UTC (rev 19994)
@@ -1,5 +1,5 @@
 Author: Steve Robbins <smr at debian.org>
-Last-Changed: Sat Aug 22 14:06:02 CDT 2015
+Last-Changed: Mon Aug 24 22:36:21 CDT 2015
 Forwarded-Upstream: No
 Description: Build using system findpackage.cmake files
 
@@ -9,15 +9,13 @@
 variable HDF5_C_LIBRARIES is used.
 
 
---- libminc-2.3.00~2015-08-22.orig/CMakeLists.txt
-+++ libminc-2.3.00~2015-08-22/CMakeLists.txt
-@@ -60,6 +59,9 @@
-   # external packages
+--- libminc-2.3.00~2015-08-24.orig/CMakeLists.txt
++++ libminc-2.3.00~2015-08-24/CMakeLists.txt
+@@ -61,6 +61,7 @@
    FIND_PACKAGE(ZLIB REQUIRED)
    FIND_PACKAGE(HDF5 REQUIRED)
-+
+   SET(HAVE_ZLIB ON)
 +  set(HDF5_LIBRARY ${HDF5_C_LIBRARIES})
-+  
  ELSE(NOT LIBMINC_EXTERNALLY_CONFIGURED)
    #TODO: set paths for HDF5 etc
  ENDIF(NOT LIBMINC_EXTERNALLY_CONFIGURED)

Modified: trunk/packages/minc/libminc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/rules	2015-08-25 03:27:26 UTC (rev 19993)
+++ trunk/packages/minc/libminc/trunk/debian/rules	2015-08-25 03:43:05 UTC (rev 19994)
@@ -11,14 +11,14 @@
 	-DBUILD_TESTING:BOOL=ON \
 	-DLIBMINC_BUILD_EZMINC_EXAMPLES:BOOL=ON \
 	-DLIBMINC_BUILD_SHARED_LIBS:BOOL=ON \
-	-DLIBMINC_MINC1_SUPPORT:BOOL=OFF
+	-DLIBMINC_MINC1_SUPPORT:BOOL=ON
 
 override_dh_auto_configure:
 	rm -f cmake-modules/*HDF5*
 	dh_auto_configure -- $(CMAKE_FLAGS)
 
 override_dh_install:
-	dh_install -plibminc2-3.0.0 --autodest debian/tmp/usr/lib/*/lib*.so.*
+	dh_install -plibminc2-4.0.0 --autodest debian/tmp/usr/lib/*/lib*.so.*
 	dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so
 	dh_install -plibminc-dev debian/tmp/usr/lib/*/*.cmake /usr/lib/$(ARCH)/cmake/minc
 	dh_install -plibminc-dev --autodest debian/tmp/usr/include