[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1112988: hdrmerge: diff for NMU version 0.5+git20200117-4.2



Control: tags 1112988 + patch
Control: tags 1112988 + pending

Dear maintainer,

I've prepared an NMU for hdrmerge (versioned as 0.5+git20200117-4.2)
and uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it.

cu
Adrian
diffstat for hdrmerge-0.5+git20200117 hdrmerge-0.5+git20200117

 changelog                                              |    7 +++++
 patches/0001-Bump-cmake_minimum_required-to-3.10.patch |   22 +++++++++++++++++
 patches/series                                         |    1 
 3 files changed, 30 insertions(+)

diff -Nru hdrmerge-0.5+git20200117/debian/changelog hdrmerge-0.5+git20200117/debian/changelog
--- hdrmerge-0.5+git20200117/debian/changelog	2024-09-03 08:22:48.000000000 +0300
+++ hdrmerge-0.5+git20200117/debian/changelog	2025-11-19 22:42:24.000000000 +0200
@@ -1,3 +1,10 @@
+hdrmerge (0.5+git20200117-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with CMake 4. (Closes: #1112988)
+
+ -- Adrian Bunk <bunk@debian.org>  Wed, 19 Nov 2025 22:42:24 +0200
+
 hdrmerge (0.5+git20200117-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru hdrmerge-0.5+git20200117/debian/patches/0001-Bump-cmake_minimum_required-to-3.10.patch hdrmerge-0.5+git20200117/debian/patches/0001-Bump-cmake_minimum_required-to-3.10.patch
--- hdrmerge-0.5+git20200117/debian/patches/0001-Bump-cmake_minimum_required-to-3.10.patch	1970-01-01 02:00:00.000000000 +0200
+++ hdrmerge-0.5+git20200117/debian/patches/0001-Bump-cmake_minimum_required-to-3.10.patch	2025-11-19 22:42:24.000000000 +0200
@@ -0,0 +1,22 @@
+From aa282e77c9866393b6f70948a59c71e31eb046ca Mon Sep 17 00:00:00 2001
+From: Morgan Hardwood <bugs@londonlight.org>
+Date: Sat, 26 Apr 2025 19:50:25 +0200
+Subject: Bump cmake_minimum_required to 3.10
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9330805..aeb18a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.10)
+ 
+ cmake_policy(SET CMP0025 NEW)
+ 
+-- 
+2.30.2
+
diff -Nru hdrmerge-0.5+git20200117/debian/patches/series hdrmerge-0.5+git20200117/debian/patches/series
--- hdrmerge-0.5+git20200117/debian/patches/series	2024-09-03 08:20:55.000000000 +0300
+++ hdrmerge-0.5+git20200117/debian/patches/series	2025-11-19 22:42:24.000000000 +0200
@@ -1,3 +1,4 @@
 0001-Fix-LibRaw-0.21-API-change.patch
 221.patch
 0001-Adapt-to-Exiv2-0.28.0-API-change.patch
+0001-Bump-cmake_minimum_required-to-3.10.patch 

Reply to: