diff -Nru libjsoncpp-1.9.5/debian/changelog libjsoncpp-1.9.5/debian/changelog --- libjsoncpp-1.9.5/debian/changelog 2022-06-01 02:24:38.000000000 +0000 +++ libjsoncpp-1.9.5/debian/changelog 2024-01-19 19:09:11.000000000 +0000 @@ -1,10 +1,32 @@ -libjsoncpp (1.9.5-3~20.04.sav0) focal; urgency=medium +libjsoncpp (1.9.5-6~20.04.sav0) focal; urgency=medium * Backport to Focal * Revert "Disable build of static library" (adjust d/libjsoncpp-dev.install) + * debian/rules: Change execute_* -> override_* with dh_* invocation(s) * debian/control: Set debhelper-compat (= 12) BD - -- Rob Savoury Tue, 31 May 2022 19:24:38 -0700 + -- Rob Savoury Fri, 19 Jan 2024 11:09:11 -0800 + +libjsoncpp (1.9.5-6) unstable; urgency=medium + + * Bump CMake policy version to avoid deprecation warning (Closes: #1040719) + + -- Timo Röhling Sun, 09 Jul 2023 23:26:30 +0200 + +libjsoncpp (1.9.5-5) unstable; urgency=medium + + * Simplify d/rules and properly clean up after build + * Prevent duplicate JsonCpp::JsonCpp target definition + * Bump Standards-Version to 4.6.2 + * Add hardening flags to build + + -- Timo Röhling Sun, 02 Jul 2023 22:56:39 +0200 + +libjsoncpp (1.9.5-4) unstable; urgency=medium + + * Fix autopkgtest to not use empty string as CLI argument + + -- Timo Röhling Wed, 30 Mar 2022 09:20:36 +0200 libjsoncpp (1.9.5-3) unstable; urgency=medium diff -Nru libjsoncpp-1.9.5/debian/clean libjsoncpp-1.9.5/debian/clean --- libjsoncpp-1.9.5/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ libjsoncpp-1.9.5/debian/clean 2022-07-25 21:08:29.000000000 +0000 @@ -0,0 +1,8 @@ +devtools/__pycache__/ +dist/ +doc/doxyfile +doc/*.db +test/data/*.actual +test/data/*.actual-rewrite +test/data/*.process-output +test/data/*.rewrite diff -Nru libjsoncpp-1.9.5/debian/control libjsoncpp-1.9.5/debian/control --- libjsoncpp-1.9.5/debian/control 2022-06-01 02:24:38.000000000 +0000 +++ libjsoncpp-1.9.5/debian/control 2024-01-19 19:09:11.000000000 +0000 @@ -3,7 +3,7 @@ Maintainer: Timo Röhling Build-Depends: cmake, debhelper-compat (= 12), python3:any Build-Depends-Indep: doxygen -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Section: libs Rules-Requires-Root: no Homepage: https://github.com/open-source-parsers/jsoncpp diff -Nru libjsoncpp-1.9.5/debian/patches/0001-Prevent-duplicate-JsonCpp-JsonCpp-target-definition.patch libjsoncpp-1.9.5/debian/patches/0001-Prevent-duplicate-JsonCpp-JsonCpp-target-definition.patch --- libjsoncpp-1.9.5/debian/patches/0001-Prevent-duplicate-JsonCpp-JsonCpp-target-definition.patch 1970-01-01 00:00:00.000000000 +0000 +++ libjsoncpp-1.9.5/debian/patches/0001-Prevent-duplicate-JsonCpp-JsonCpp-target-definition.patch 2023-07-09 21:26:30.000000000 +0000 @@ -0,0 +1,32 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sun, 2 Jul 2023 22:53:29 +0200 +Subject: Prevent duplicate JsonCpp::JsonCpp target definition + +Author: zeroxia +Bug: https://github.com/open-source-parsers/jsoncpp/pull/1491 +--- + jsoncpp-namespaced-targets.cmake | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/jsoncpp-namespaced-targets.cmake b/jsoncpp-namespaced-targets.cmake +index ac1504e..70a79ee 100644 +--- a/jsoncpp-namespaced-targets.cmake ++++ b/jsoncpp-namespaced-targets.cmake +@@ -1,7 +1,9 @@ +-if (TARGET jsoncpp_static) +- add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) +- set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static") +-elseif (TARGET jsoncpp_lib) +- add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) +- set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib") +-endif () +\ No newline at end of file ++if (NOT TARGET JsonCpp::JsonCpp) ++ if (TARGET jsoncpp_static) ++ add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) ++ set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static") ++ elseif (TARGET jsoncpp_lib) ++ add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) ++ set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib") ++ endif () ++endif () diff -Nru libjsoncpp-1.9.5/debian/patches/0002-Fix-cmake_policy.patch libjsoncpp-1.9.5/debian/patches/0002-Fix-cmake_policy.patch --- libjsoncpp-1.9.5/debian/patches/0002-Fix-cmake_policy.patch 1970-01-01 00:00:00.000000000 +0000 +++ libjsoncpp-1.9.5/debian/patches/0002-Fix-cmake_policy.patch 2023-07-09 21:26:30.000000000 +0000 @@ -0,0 +1,21 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sun, 9 Jul 2023 23:23:51 +0200 +Subject: Fix cmake_policy() + +Bug-Debian: https://bugs.debian.org/1040719 +Forwarded: https://github.com/open-source-parsers/jsoncpp/pull/1499 +--- + jsoncppConfig.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jsoncppConfig.cmake.in b/jsoncppConfig.cmake.in +index 76570bc..fdd9fea 100644 +--- a/jsoncppConfig.cmake.in ++++ b/jsoncppConfig.cmake.in +@@ -1,5 +1,5 @@ + cmake_policy(PUSH) +-cmake_policy(VERSION 3.0) ++cmake_policy(VERSION 3.0...3.26) + + @PACKAGE_INIT@ + diff -Nru libjsoncpp-1.9.5/debian/patches/series libjsoncpp-1.9.5/debian/patches/series --- libjsoncpp-1.9.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libjsoncpp-1.9.5/debian/patches/series 2023-07-09 21:26:30.000000000 +0000 @@ -0,0 +1,2 @@ +0001-Prevent-duplicate-JsonCpp-JsonCpp-target-definition.patch +0002-Fix-cmake_policy.patch diff -Nru libjsoncpp-1.9.5/debian/rules libjsoncpp-1.9.5/debian/rules --- libjsoncpp-1.9.5/debian/rules 2022-06-01 02:24:38.000000000 +0000 +++ libjsoncpp-1.9.5/debian/rules 2024-01-19 19:09:11.000000000 +0000 @@ -1,11 +1,13 @@ #!/usr/bin/make -f # -*- makefile -*- +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ --buildsystem=cmake ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -CONFIGURE_FLAGS += -DJSONCPP_WITH_TESTS=Off +CONFIGURE_FLAGS += -DJSONCPP_WITH_TESTS=OFF endif override_dh_auto_configure: @@ -16,17 +18,10 @@ $(CONFIGURE_FLAGS) override_dh_auto_test: - dh_auto_test --max-parallel=1 + dh_auto_test --buildsystem=cmake --max-parallel=1 override_dh_auto_build-indep: + dh_auto_build -i ln -s obj-*/version . python3 doxybuild.py --doxygen=/usr/bin/doxygen rm version - dh_auto_build - -override_dh_auto_clean: - dh_auto_clean - rm -rf dist - rm -f devtools/*.pyc - rm -f doc/doxyfile - rm -f doc/*.db diff -Nru libjsoncpp-1.9.5/debian/tests/testsuite libjsoncpp-1.9.5/debian/tests/testsuite --- libjsoncpp-1.9.5/debian/tests/testsuite 2022-01-29 16:46:07.000000000 +0000 +++ libjsoncpp-1.9.5/debian/tests/testsuite 2022-03-30 09:16:31.000000000 +0000 @@ -41,6 +41,6 @@ # Configure, build and execute. mkdir build && cd build -cmake "$CCFILE" .. +cmake $CCFILE .. make VERBOSE=1 -j$(nproc) ./jsoncpp_test