[med-svn] [Git][med-team/libminc][master] 7 commits: Set package name to match SOVERSION.

Steven Robbins (@smr) gitlab at salsa.debian.org
Fri Sep 2 04:45:04 BST 2022 


Steven Robbins pushed to branch master at Debian Med / libminc


Commits:
055ad762 by Steve Robbins at 2022-08-21T11:09:10-05:00
Set package name to match SOVERSION.

- - - - -
270bf2ac by Steve Robbins at 2022-08-21T11:48:58-05:00
release

- - - - -
504f2bcb by Steve Robbins at 2022-08-23T21:47:15-05:00
release

- - - - -
5e0279b6 by Steve Robbins at 2022-09-01T21:20:41-05:00
Restore fix for LIBMINC_USE_FILE_CONFIG, inadvertently removed.
Patches generated using gbp patch-queue, so the preamble changed for others.

- - - - -
9d09dca5 by Steve Robbins at 2022-09-01T21:23:14-05:00
release

- - - - -
d8373de2 by Steve Robbins at 2022-09-01T22:36:23-05:00
Patch to properly remove RPATH.

- - - - -
6219bd5c by Steve Robbins at 2022-09-01T22:37:53-05:00
release

- - - - -


12 changed files:

- debian/changelog
- debian/control
- debian/libminc2-5.2.0.install → debian/libminc2-5.3.0.install
- + debian/patches/0005-Disable-setting-RPATH.patch
- + debian/patches/0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
- debian/patches/build-using-system-find-dot-cmake
- debian/patches/disable-dimension-test.patch
- − debian/patches/fix-uselibminc-cmake
- debian/patches/initialize_arrays_in_tests.patch
- − debian/patches/netcdf-4.6.patch
- − debian/patches/remove-rpath.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,15 +1,36 @@
-libminc (2.4.05-1) UNRELEASED; urgency=medium
+libminc (2.4.05-4) unstable; urgency=medium
 
+  [ Steve Robbins ]
+  * [d8373de] Patch to properly remove RPATH.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 01 Sep 2022 22:37:37 -0500
+
+libminc (2.4.05-3) unstable; urgency=medium
+
+  [ Steve Robbins ]
+  * [5e0279b] Restore fix for LIBMINC_USE_FILE_CONFIG, inadvertently removed. 
+    Patches generated using gbp patch-queue, so the preamble changed for others.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 01 Sep 2022 21:22:42 -0500
+
+libminc (2.4.05-2) unstable; urgency=medium
+
+  * Useless revision for testing migration.
+
+ -- Steve M. Robbins <smr at debian.org>  Tue, 23 Aug 2022 21:46:56 -0500
+
+libminc (2.4.05-1) unstable; urgency=medium
+
+  [ Andreas Tille ]
   * New upstream version
   * Standards-Version: 4.6.1 (routine-update)
   * Drop unneeded debian/.gitlab-ci.yml
   * Add symbols file
-  TODO: Hmmm, upstream seems to have bumped SONAME to 5.3.0 for no good
-        reason as far as I can see since symbols did not change.  Since
-        I see no point in changing the binary package name for an unneeded
-        SONAME bump I'm stopping here
 
- -- Andreas Tille <tille at debian.org>  Mon, 25 Jul 2022 15:24:44 +0200
+  [ Steve Robbins ]
+  * [055ad76] Set package name to match SOVERSION.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 21 Aug 2022 11:48:32 -0500
 
 libminc (2.4.03-5) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Vcs-Git: https://salsa.debian.org/med-team/libminc.git
 Homepage: https://github.com/BIC-MNI/libminc
 Rules-Requires-Root: no
 
-Package: libminc2-5.2.0
+Package: libminc2-5.3.0
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -43,7 +43,7 @@ Package: libminc-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libminc2-5.2.0 (= ${binary:Version}),
+         libminc2-5.3.0 (= ${binary:Version}),
          libnetcdf-dev,
          libhdf5-dev
 Conflicts: libminc0-dev


=====================================
debian/libminc2-5.2.0.install → debian/libminc2-5.3.0.install
=====================================


=====================================
debian/patches/0005-Disable-setting-RPATH.patch
=====================================
@@ -0,0 +1,20 @@
+From: Steve Robbins <steve at sumost.ca>
+Date: Thu, 1 Sep 2022 22:34:53 -0500
+Subject: Disable setting RPATH.
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 584dde7..3a8500d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -448,7 +448,6 @@ ENDIF(LIBMINC_MINC1_SUPPORT)
+ 
+ # Keep this variable for compatibility
+ SET(VOLUME_IO_LIBRARY  minc2)
+-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ ADD_LIBRARY(${LIBMINC_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
+ 


=====================================
debian/patches/0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
=====================================
@@ -0,0 +1,21 @@
+From: Steve Robbins <steve at sumost.ca>
+Date: Thu, 1 Sep 2022 21:13:31 -0500
+Subject: Fix setting of LIBMINC_USE_FILE_CONFIG to be correct for Debian..
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d80291..584dde7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -525,7 +525,7 @@ ENDIF()
+ 
+ 
+ # config for install dir
+-SET(LIBMINC_USE_FILE_CONFIG     "\${LIBMINC_INSTALL_PREFIX}/lib/cmake/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake" )
++SET(LIBMINC_USE_FILE_CONFIG     "\${LIBMINC_INSTALL_PREFIX}/cmake/LIBMINC/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake" )
+ SET(LIBMINC_INCLUDE_DIRS_CONFIG "\${LIBMINC_INSTALL_PREFIX}/include" )
+ SET(LIBMINC_LIBRARY_DIRS_CONFIG "\${LIBMINC_INSTALL_PREFIX}/lib" )
+ SET(LIBMINC_STATIC_LIBRARIES_CONFIG   "" )


=====================================
debian/patches/build-using-system-find-dot-cmake
=====================================
@@ -1,14 +1,20 @@
-Author: Steve Robbins <smr at debian.org>
+From: Steve Robbins <smr at debian.org>
+Date: Thu, 1 Sep 2022 21:00:02 -0500
+Subject: Build using system findpackage.cmake files
+
 Last-Changed: Mon Aug 24 22:36:21 CDT 2015
 Forwarded-Upstream: No
-Description: Build using system findpackage.cmake files
 
 The sources contain an older copy of FindNETCDF.cmake.
 We delete that in debian/rules to use the system-supplied
 version, but also require this patch so that the newer
 variable HDF5_C_LIBRARIES is used.
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
 
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 708fc78..2d80291 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -82,6 +82,7 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)


=====================================
debian/patches/disable-dimension-test.patch
=====================================
@@ -1,12 +1,21 @@
-Author: Gert Wollny <gewo at debian.org>
-Description: Disable the minc2 dimension tests, fails on bigendian
- This is a temporary measure to get reverese dependencies like ITK
- forward. ITK needs this new version and doesn't run on bigendian 
- anyway. 
+From: Gert Wollny <gewo at debian.org>
+Date: Thu, 1 Sep 2022 21:00:02 -0500
+Subject: Disable the minc2 dimension tests, fails on bigendian
+
 Bug: https://github.com/BIC-MNI/libminc/issues/100
+
+This is a temporary measure to get reverese dependencies like ITK
+forward. ITK needs this new version and doesn't run on bigendian 
+anyway.
+---
+ testdir/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testdir/CMakeLists.txt b/testdir/CMakeLists.txt
+index 493d080..5637880 100644
 --- a/testdir/CMakeLists.txt
 +++ b/testdir/CMakeLists.txt
-@@ -134,7 +134,7 @@ ADD_EXECUTABLE(minc2-create-test-images-
+@@ -134,7 +134,7 @@ ADD_EXECUTABLE(minc2-create-test-images-2 minc2-create-test-images-2.c)
  ADD_EXECUTABLE(minc2-create-test-images minc2-create-test-images.c)
  ADD_EXECUTABLE(minc2-datatype-test minc2-datatype-test.c)
  ADD_EXECUTABLE(minc2-large-attribute minc2-large-attribute.c)
@@ -15,7 +24,7 @@ Bug: https://github.com/BIC-MNI/libminc/issues/100
  ADD_EXECUTABLE(minc2-full-test minc2-full-test.c)
  ADD_EXECUTABLE(minc2-grpattr-test minc2-grpattr-test.c)
  ADD_EXECUTABLE(minc2-hyper-test-2 minc2-hyper-test-2.c)
-@@ -171,7 +171,7 @@ add_minc_test(minc2-large-attribute-1m
+@@ -171,7 +171,7 @@ add_minc_test(minc2-large-attribute-1m    minc2-large-attribute 1000000)
  add_minc_test(minc2-datatype-test         minc2-datatype-test  
                                            ${CMAKE_CURRENT_BINARY_DIR}/datatype_minc2.mnc)
                                            


=====================================
debian/patches/fix-uselibminc-cmake deleted
=====================================
@@ -1,4 +0,0 @@
-Author: Steve M. Robbins
-Last-Update: 2015-09-05 03:35:21 +0000
-Description: Fix usage of cmake
-


=====================================
debian/patches/initialize_arrays_in_tests.patch
=====================================
@@ -1,10 +1,17 @@
-Description: Initialize arrays in tests
- in C it can not be assumed that the arrays are initialaized to a sane
- value when they are declared on the stack, hence initialiaze the 
- dimension to zero (this also makes the compiler fill the whole struct
- with zeros. 
-Author: Gert Wollny <gewo at debian.org>
+From: Gert Wollny <gewo at debian.org>
+Date: Thu, 1 Sep 2022 21:00:02 -0500
+Subject: Initialize arrays in tests
 
+in C it can not be assumed that the arrays are initialaized to a sane
+value when they are declared on the stack, hence initialiaze the 
+dimension to zero (this also makes the compiler fill the whole struct
+with zeros.
+---
+ testdir/multidim_test.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testdir/multidim_test.c b/testdir/multidim_test.c
+index ea088c0..769b0dc 100644
 --- a/testdir/multidim_test.c
 +++ b/testdir/multidim_test.c
 @@ -5,7 +5,7 @@


=====================================
debian/patches/netcdf-4.6.patch deleted
=====================================
@@ -1,19 +0,0 @@
-Author: Gert Wollny <gw.fosssdev at gmail.com>
-Description: Strip the MINC flag before the call to nccreate
- This is a hole-plugging fix, mixing the MINC flags with the backend 
- flags is really bad style ...
-Debian-Bug: http://bugs.debian.org/888925
-
-Upstream had used: cmode & 0xffff instead here
-
---- a/libsrc/netcdf_convenience.c
-+++ b/libsrc/netcdf_convenience.c
-@@ -600,7 +600,7 @@
-     MI_SAVE_ROUTINE_NAME("micreate");
- 
-     if ((cmode & MI2_CREATE_V1) != 0) {
--        fd = nccreate(path, cmode);
-+        fd = nccreate(path, cmode & ~MI2_CREATE_V1);
-     }
-     else if (miget_cfg_bool(MICFG_FORCE_V2) || (cmode & MI2_CREATE_V2) != 0) {
- 	fd = hdf_create(path, cmode, opts_ptr);


=====================================
debian/patches/remove-rpath.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Remove RPATH to silence lintian
-Author: Gert Wollny <gewo at debian.org>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,10 +87,6 @@ ELSE(NOT LIBMINC_EXTERNALLY_CONFIGURED)
-   #TODO: set paths for HDF5 etc
- ENDIF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
- 
--IF(NOT DEFINED CMAKE_MACOSX_RPATH)
--  set(CMAKE_MACOSX_RPATH ON)
--ENDIF(NOT DEFINED CMAKE_MACOSX_RPATH)
--
- # Configure libminc
- IF(LIBMINC_BUILD_SHARED_LIBS)
-   SET(LIBRARY_TYPE SHARED)


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,5 @@
 build-using-system-find-dot-cmake
-#fix-uselibminc-cmake
-#netcdf-4.6.patch
-remove-rpath.patch
 initialize_arrays_in_tests.patch
 disable-dimension-test.patch
+0005-Fix-setting-of-LIBMINC_USE_FILE_CONFIG-to-be-correct.patch
+0005-Disable-setting-RPATH.patch



View it on GitLab: https://salsa.debian.org/med-team/libminc/-/compare/ae466a647537b27d7630139dfb9b1ba66e281fc4...6219bd5c1821c5f684f3a7fd6688c0b62cd8ef10

-- 
View it on GitLab: https://salsa.debian.org/med-team/libminc/-/compare/ae466a647537b27d7630139dfb9b1ba66e281fc4...6219bd5c1821c5f684f3a7fd6688c0b62cd8ef10
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220902/c5b083c6/attachment-0001.htm>

More information about the debian-med-commit mailing list