[Pkg-cmake-team] Bug#1087233: cmake: diff for NMU version 3.30.5-1.1

[steve at sumost.ca]

Package: cmake
Version: 3.30.5-1
Severity: normal
Tags: patch

diff -Nru cmake-3.30.5/debian/changelog cmake-3.30.5/debian/changelog
--- cmake-3.30.5/debian/changelog	2024-10-09 01:14:22.000000000 -0500
+++ cmake-3.30.5/debian/changelog	2024-11-11 17:24:10.000000000 -0600
@@ -1,3 +1,11 @@
+cmake (3.30.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * patches/FindImageMagick-version7.patch: adapt for ImageMagick version 7.
+    Closes #1087233.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 11 Nov 2024 17:24:10 -0600
+
 cmake (3.30.5-1) unstable; urgency=medium
 
   * New upstream version 3.30.5
diff -Nru cmake-3.30.5/debian/patches/FindImageMagick-version7.patch cmake-3.30.5/debian/patches/FindImageMagick-version7.patch
--- cmake-3.30.5/debian/patches/FindImageMagick-version7.patch	1969-12-31 18:00:00.000000000 -0600
+++ cmake-3.30.5/debian/patches/FindImageMagick-version7.patch	2024-11-11 17:24:10.000000000 -0600
@@ -0,0 +1,11 @@
+--- a/Modules/FindImageMagick.cmake	2024-11-11 17:16:58.498864745 -0600
++++ b/Modules/FindImageMagick.cmake	2024-11-11 17:18:49.723402202 -0600
+@@ -129,7 +129,7 @@
+     NO_DEFAULT_PATH
+     )
+   find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
+-    NAMES magick/magick-baseconfig.h
++    NAMES magick/magick-baseconfig.h MagickCore/magick-baseconfig.h
+     HINTS
+       ${PC_${component}_INCLUDEDIR}
+       ${PC_${component}_INCLUDE_DIRS}
diff -Nru cmake-3.30.5/debian/patches/series cmake-3.30.5/debian/patches/series
--- cmake-3.30.5/debian/patches/series	2024-10-09 01:14:22.000000000 -0500
+++ cmake-3.30.5/debian/patches/series	2024-11-11 17:23:05.000000000 -0600
@@ -1 +1,2 @@
 0001-Prefer-default-Python-version.patch
+FindImageMagick-version7.patch