[med-svn] [Git][med-team/ciftilib][master] 2 commits: Update xmlplusplus4.patch to fix error detected by autopkgtest

[Jeremy Bícha (@jbicha)]

Jeremy Bícha pushed to branch master at Debian Med / ciftilib


Commits:
72448a70 by Aurelien Jarno at 2026-08-14T11:48:44+02:00
Update xmlplusplus4.patch to fix error detected by autopkgtest

Closes: #1144318

- - - - -
3de20f05 by Jeremy Bícha at 2026-08-14T11:49:57+02:00
releasing package ciftilib version 1.6.0-10

- - - - -


2 changed files:

- debian/changelog
- debian/patches/xmlplusplus4.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+ciftilib (1.6.0-10) unstable; urgency=high
+
+  * Team upload
+
+  [ Aurelien Jarno ]
+  * Update xmlplusplus4.patch to fix error detected by autopkgtest
+    (Closes: #1144318)
+
+ -- Jeremy Bícha <jbicha at ubuntu.com>  Fri, 14 Aug 2026 11:49:42 +0200
+
 ciftilib (1.6.0-9) unstable; urgency=medium
 
   * d/control: replace Ghislain Vaillant in Uploaders.


=====================================
debian/patches/xmlplusplus4.patch
=====================================
@@ -4,7 +4,7 @@ Subject: Upgrade dependency from libxml++2.6-dev to libxml++-4.0-dev
 
 Bug-Debian: http://bugs.debian.org/1121313
 ---
- CMakeLists.txt                    |  2 +-
+ CMakeLists.txt                    |  6 +++---
  cmake/Modules/Findglibmm.cmake    |  4 ++--
  cmake/Modules/Findlibxml++.cmake  |  4 ++--
  cmake/Modules/Findsigc++.cmake    |  4 ++--
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/1121313
  src/Cifti/LabelTable.cxx          |  4 ++--
  src/Cifti/MetaData.cxx            |  8 ++++----
  src/Common/XmlAdapter.cxx         | 18 +++++++++---------
- 13 files changed, 71 insertions(+), 71 deletions(-)
+ 13 files changed, 73 insertions(+), 73 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index aced570..390f2ec 100644
@@ -32,6 +32,21 @@ index aced570..390f2ec 100644
      SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)
  ENDIF (${CMAKE_VERSION} VERSION_LESS "3.1")
  
+@@ -65,12 +65,12 @@ IF (NOT QT_FOUND)
+ 
+ #alternative to QT xml, string
+ IF (NOT QT_FOUND)
+-    FIND_PACKAGE(libxml++ 2.17.0 REQUIRED)
++    FIND_PACKAGE(libxml++ 4.0 REQUIRED)
+     INCLUDE_DIRECTORIES(${libxml++_INCLUDE_DIRS})
+     SET(LIBS ${LIBS} ${libxml++_LIBRARIES})
+     ADD_DEFINITIONS(-DCIFTILIB_USE_XMLPP)
+     #for pkg-config file
+-    SET(CIFTILIB_PKGCONFIG_REQUIRES_LINE "Requires: libxml++-2.6 >= 2.17.0")
++    SET(CIFTILIB_PKGCONFIG_REQUIRES_LINE "Requires: libxml++-4.0")
+     SET(CIFTILIB_PKGCONFIG_DEFINE "-DCIFTILIB_USE_XMLPP")
+ ENDIF (NOT QT_FOUND)
+ 
 diff --git a/cmake/Modules/Findglibmm.cmake b/cmake/Modules/Findglibmm.cmake
 index c9b9bef..d190398 100644
 --- a/cmake/Modules/Findglibmm.cmake



View it on GitLab: https://salsa.debian.org/med-team/ciftilib/-/compare/f274c045c1d3928dc5a48f732f74d18494e07550...3de20f05e8126b072d970eea721cdbe67c5c870c

-- 
View it on GitLab: https://salsa.debian.org/med-team/ciftilib/-/compare/f274c045c1d3928dc5a48f732f74d18494e07550...3de20f05e8126b072d970eea721cdbe67c5c870c
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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