[med-svn] [Git][med-team/ismrmrd][master] Add upstream cherry-pick of proposed pull request to fix autopkgtests failures with new PugiXML

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch master at Debian Med / ismrmrd


Commits:
67972d5d by Gianfranco Costamagna at 2020-12-22T15:45:31+01:00
Add upstream cherry-pick of proposed pull request to fix autopkgtests failures with new PugiXML

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/167.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ismrmrd (1.4.2.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * debian/patches/167.patch:
+    - cherry-pick upstream proposed fix for typo in variable name in cmake
+      file making autopkgtest regress with new pugixml 1.11.3
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 22 Dec 2020 15:43:09 +0100
+
 ismrmrd (1.4.2.1-5) unstable; urgency=medium
 
   * Runtime-depend on libpugixml-dev to fix autopkgtest failure (Closes:


=====================================
debian/patches/167.patch
=====================================
@@ -0,0 +1,24 @@
+From e8d3d90468f3ecae5cee3f7fa92e252076bf1df4 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Tue, 22 Dec 2020 15:42:49 +0100
+Subject: [PATCH] Fix PugiXML variable name
+
+This was making the testsuite fail because with new PugiXML the find_package can't be done twice anymore
+See: https://github.com/zeux/pugixml/issues/393
+---
+ cmake/ISMRMRDConfig.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/ISMRMRDConfig.cmake.in b/cmake/ISMRMRDConfig.cmake.in
+index 9f3df33..8c3d60f 100644
+--- a/cmake/ISMRMRDConfig.cmake.in
++++ b/cmake/ISMRMRDConfig.cmake.in
+@@ -36,7 +36,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${ISMRMRD_CMAKE_DIR})
+ 
+ if(USE_SYSTEM_PUGIXML)
+   find_package(PugiXML CONFIG)
+-  if (NOT PUGIXML_FOUND)
++  if (NOT PugiXML_FOUND)
+     find_dependency(PugiXML)
+   endif()
+ endif()


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ Use-explicit-64-bit-shifts-in-testsuite.patch
 Add-support-for-multiarch.patch
 remove-travis-build-status.patch
 add_static_lib.patch
+167.patch



View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/67972d5d812dd480ec25d98529a017434099da76

-- 
View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/67972d5d812dd480ec25d98529a017434099da76
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/20201222/47e7421f/attachment-0001.html>