diff -pruN 3.24.0-1/debian/changelog 3.24.0-1ubuntu1/debian/changelog --- 3.24.0-1/debian/changelog 2022-08-04 20:13:42.000000000 +0000 +++ 3.24.0-1ubuntu1/debian/changelog 2022-08-05 08:36:56.000000000 +0000 @@ -1,9 +1,23 @@ +cmake (3.24.0-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support. + + -- Gianfranco Costamagna Fri, 05 Aug 2022 10:36:56 +0200 + cmake (3.24.0-1) unstable; urgency=medium * New upstream version 3.24.0 -- Timo Röhling Thu, 04 Aug 2022 22:13:42 +0200 +cmake (3.23.3-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support. + + -- Gianfranco Costamagna Mon, 01 Aug 2022 09:34:17 +0200 + cmake (3.23.3-1) unstable; urgency=medium * New upstream version 3.23.3 @@ -11,6 +25,13 @@ cmake (3.23.3-1) unstable; urgency=mediu -- Timo Röhling Fri, 29 Jul 2022 23:19:03 +0200 +cmake (3.23.2-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support. + + -- Gianfranco Costamagna Thu, 26 May 2022 13:16:58 +0200 + cmake (3.23.2-1) unstable; urgency=medium * Bump Standards-Version to 4.6.1 @@ -23,6 +44,13 @@ cmake (3.23.2-1) unstable; urgency=mediu -- Timo Röhling Wed, 25 May 2022 21:02:25 +0200 +cmake (3.23.1-2ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support. + + -- Gianfranco Costamagna Fri, 29 Apr 2022 17:01:09 +0200 + cmake (3.23.1-2) unstable; urgency=medium * Work around regression with qa=+canary. @@ -50,6 +78,13 @@ cmake (3.23.0-1) unstable; urgency=mediu -- Timo Röhling Tue, 29 Mar 2022 21:46:55 +0200 +cmake (3.22.1-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support. + + -- Steve Langasek Tue, 28 Dec 2021 19:55:36 -0800 + cmake (3.22.1-1) unstable; urgency=medium [ Mathieu Malaterre ] @@ -77,6 +112,20 @@ cmake (3.22.0-1) unstable; urgency=mediu -- Timo Röhling Sat, 20 Nov 2021 13:55:40 +0100 +cmake (3.21.4-1ubuntu2) jammy; urgency=medium + + * No-change rebuild against libjsoncpp25 + + -- Steve Langasek Tue, 14 Dec 2021 18:19:15 +0000 + +cmake (3.21.4-1ubuntu1) jammy; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - Append -latomic on RISCV, as some atomics need libatomic support + (LP: #1876814). + + -- Simon Quigley Thu, 11 Nov 2021 07:55:02 -0600 + cmake (3.21.4-1) unstable; urgency=medium * Also unset _proxy variables for ninja autopkgtest (Fixup for #960179) @@ -97,6 +146,17 @@ cmake (3.21.4-1) unstable; urgency=mediu -- Timo Röhling Tue, 02 Nov 2021 14:18:06 +0100 +cmake (3.21.3-5ubuntu1) jammy; urgency=medium + + * Merge from Debian Sid. Remaining changes: + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + - Append -latomic on RISCV, as some atomics need libatomic support + (LP: #1876814). + + -- Simon Quigley Wed, 27 Oct 2021 02:14:06 -0500 + cmake (3.21.3-5) unstable; urgency=medium * Package can be cross-compiled now @@ -164,6 +224,25 @@ cmake (3.21.2-1) unstable; urgency=mediu -- Timo Röhling Tue, 14 Sep 2021 18:05:46 +0200 +cmake (3.18.4-2ubuntu2) impish; urgency=medium + + * Backport d/patches/KWSys-2021-06-28-0648cb1a.patch from upstream to + fix build with glibc 2.34. + + -- Michael Hudson-Doyle Tue, 10 Aug 2021 13:51:21 +1200 + +cmake (3.18.4-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - add support for PostgreSQL 13 (LP: #1907680) + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + - Append -latomic on RISCV, as some atomics need libatomic support. LP: + #1876814 + + -- Gianfranco Costamagna Sun, 07 Feb 2021 19:07:02 +0100 + cmake (3.18.4-2) unstable; urgency=medium [ Helmut Grohne ] @@ -175,6 +254,30 @@ cmake (3.18.4-2) unstable; urgency=mediu -- Felix Geyer Sun, 07 Feb 2021 10:23:34 +0100 +cmake (3.18.4-1ubuntu3) hirsute; urgency=medium + + * debian/patches/f3f09f1c96e8cbd614a7f22da4055f2f8b5aa55a.patch: + - add support for PostgreSQL 13 (LP: #1907680) + + -- Gianfranco Costamagna Sat, 12 Dec 2020 19:10:12 +0100 + +cmake (3.18.4-1ubuntu2) hirsute; urgency=medium + + * Rebuild against new libjsoncpp24. + + -- Gianfranco Costamagna Mon, 07 Dec 2020 15:21:15 +0100 + +cmake (3.18.4-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + - Append -latomic on RISCV, as some atomics need libatomic support. LP: + #1876814 + + -- Gianfranco Costamagna Fri, 13 Nov 2020 10:52:33 +0100 + cmake (3.18.4-1) unstable; urgency=medium [ Tobias Frost ] @@ -198,6 +301,22 @@ cmake (3.18.2-1) unstable; urgency=mediu -- Felix Geyer Sun, 30 Aug 2020 14:41:24 +0200 +cmake (3.16.3-3ubuntu2) groovy; urgency=medium + + * Append -latomic on RISCV, as some atomics need libatomic support. LP: + #1876814 + + -- Dimitri John Ledkov Wed, 01 Jul 2020 13:29:05 +0100 + +cmake (3.16.3-3ubuntu1) groovy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + + -- Gianfranco Costamagna Sun, 10 May 2020 12:31:01 +0200 + cmake (3.16.3-3) unstable; urgency=medium * Handle -isystem from pkg-config correctly. (Closes: #959064) @@ -205,6 +324,23 @@ cmake (3.16.3-3) unstable; urgency=mediu -- Felix Geyer Sat, 09 May 2020 15:40:54 +0200 +cmake (3.16.3-2ubuntu2) groovy; urgency=medium + + * debian/patches/4693.patch: + - cherry-pick upstream merged pull request to fix change in latest + pkg-config behaviour (Closes: #959064, #959960, #960081) + + -- Gianfranco Costamagna Fri, 08 May 2020 09:03:34 +0200 + +cmake (3.16.3-2ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + + -- Gianfranco Costamagna Thu, 07 May 2020 15:34:17 +0200 + cmake (3.16.3-2) unstable; urgency=medium * Build-depend on python3-sphinxcontrib.qthelp for sphinx >= 2.0 @@ -212,12 +348,37 @@ cmake (3.16.3-2) unstable; urgency=mediu -- Felix Geyer Sun, 19 Apr 2020 18:07:42 +0200 +cmake (3.16.3-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Unset proxy settings during autopkgtest. Tests try to resolve + no-site and match stderr, with bad network on armhf autopkgtest + runners instead the stderr is failing to resolve squid.internal. + + -- Dimitri John Ledkov Thu, 06 Feb 2020 12:53:45 +0000 + cmake (3.16.3-1) unstable; urgency=medium * New upstream release. (Closes: #949964) -- Felix Geyer Sun, 02 Feb 2020 14:59:35 +0100 +cmake (3.15.4-1ubuntu3) focal; urgency=medium + + * Unset proxy settings during autopkgtest. Tests try to resolve no-site + and match stderr, with bad network on armhf autopkgtest runners + instead the stderr is failing to resolve squid.internal. + + -- Dimitri John Ledkov Wed, 15 Jan 2020 11:36:29 +0000 + +cmake (3.15.4-1ubuntu2) focal; urgency=medium + + * debian/patches/effafca77eacbb4988006b1f3f4d9154df6c33f8.patch: + - cherry-pick upstream fix for new pango related sadness + "fatal error: hb.h: No such file or directory" + + -- Gianfranco Costamagna Sat, 21 Dec 2019 19:46:11 +0100 + cmake (3.15.4-1) unstable; urgency=medium * New upstream release. (Closes: #944090) @@ -1910,7 +2071,6 @@ cmake (0.96-1) unstable; urgency=low -- A. Maitland Bottoms Wed, 28 Nov 2001 08:45:22 -0500 - cmake (2.0.5-1) unstable; urgency=low * New upstream release diff -pruN 3.24.0-1/debian/patches/riscv64-atomic.patch 3.24.0-1ubuntu1/debian/patches/riscv64-atomic.patch --- 3.24.0-1/debian/patches/riscv64-atomic.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.24.0-1ubuntu1/debian/patches/riscv64-atomic.patch 2021-11-11 13:53:51.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Append -latomic on RISCV, as some atomics need libatomic support. +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/1876814 +Author: Dimitri John Ledkov + + +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -57,3 +57,15 @@ + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) + endif() ++ ++# RISCV needs -latomic ++# https://gitlab.kitware.com/cmake/cmake/-/issues/20895 ++# ++# Ideally I'd use CMAKE_C_COMPILER_ARCHITECTURE_ID, but that is only ++# available on Win platforms. Not sure why though, cause every ++# compiler on Linux has a default architecture it compiles for too, ++# when no flags are passed to ask the compiler to behave differently. ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") ++ string(APPEND CMAKE_C_STANDARD_LIBRARIES " -latomic") ++ string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " -latomic") ++endif() diff -pruN 3.24.0-1/debian/patches/series 3.24.0-1ubuntu1/debian/patches/series --- 3.24.0-1/debian/patches/series 2022-08-04 20:13:18.000000000 +0000 +++ 3.24.0-1ubuntu1/debian/patches/series 2022-08-05 03:46:47.000000000 +0000 @@ -1 +1,2 @@ +riscv64-atomic.patch 0001-Prefer-Debian-default-version-of-Python.patch