diff -pruN 1.7.2-3/debian/changelog 1.7.2-3ubuntu6/debian/changelog --- 1.7.2-3/debian/changelog 2019-10-31 08:51:05.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/changelog 2022-03-17 17:51:12.000000000 +0000 @@ -1,3 +1,87 @@ +rrdtool (1.7.2-3ubuntu6) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only. + + -- Matthias Klose Thu, 17 Mar 2022 18:51:12 +0100 + +rrdtool (1.7.2-3ubuntu5) jammy; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Sun, 06 Feb 2022 13:52:26 +0100 + +rrdtool (1.7.2-3ubuntu4) jammy; urgency=medium + + * d/patches/0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch: + backport patch from upstream to fix ftbfs with glibc 2.35. + + -- Michael Hudson-Doyle Thu, 27 Jan 2022 10:14:12 +1300 + +rrdtool (1.7.2-3ubuntu3) jammy; urgency=medium + + * No-change upload due to ruby3.0 transition, remove ruby2.7 support. + + -- Lucas Kanashiro Tue, 07 Dec 2021 19:06:55 -0300 + +rrdtool (1.7.2-3ubuntu2) jammy; urgency=medium + + * No-change upload due to ruby3.0 transition. + + -- Lucas Kanashiro Wed, 17 Nov 2021 16:54:06 -0300 + +rrdtool (1.7.2-3ubuntu1) jammy; urgency=medium + + * Stop building the python3-rrdtool-dbg package. + * Fix installation of the python3.10 extension. + + -- Matthias Klose Sun, 17 Oct 2021 10:40:11 +0200 + +rrdtool (1.7.2-3build7) jammy; urgency=medium + + * No-change rebuild to add python3.10. + + -- Matthias Klose Sat, 16 Oct 2021 22:00:48 +0200 + +rrdtool (1.7.2-3build6) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:23:57 +0200 + +rrdtool (1.7.2-3build5) hirsute; urgency=medium + + * No-change rebuild to drop python3.8 extensions. + + -- Matthias Klose Mon, 07 Dec 2020 18:45:34 +0100 + +rrdtool (1.7.2-3build4) hirsute; urgency=medium + + * No-change rebuild for the perl update. + + -- Matthias Klose Mon, 09 Nov 2020 12:47:03 +0100 + +rrdtool (1.7.2-3build3) hirsute; urgency=medium + + * No-change rebuild to build with python3.9 as supported. + + -- Matthias Klose Sat, 24 Oct 2020 10:55:43 +0200 + +rrdtool (1.7.2-3build2) focal; urgency=medium + + [ Rafael David Tinoco ] + * Sponsoring ruby2.7 transitions + + [ Lucas Kanashiro ] + * No-change rebuild for ruby2.7 + + -- Rafael David Tinoco Wed, 26 Feb 2020 17:10:48 +0000 + +rrdtool (1.7.2-3build1) focal; urgency=medium + + * No-change rebuild to drop python3.7. + + -- Matthias Klose Tue, 18 Feb 2020 10:25:40 +0100 + rrdtool (1.7.2-3) unstable; urgency=medium * Added Breaks+Replaces for debug symbols migration. (Closes: #943840) diff -pruN 1.7.2-3/debian/control 1.7.2-3ubuntu6/debian/control --- 1.7.2-3/debian/control 2019-10-31 08:50:36.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/control 2022-01-25 02:41:38.000000000 +0000 @@ -1,7 +1,8 @@ Source: rrdtool Section: utils Priority: optional -Maintainer: Debian RRDtool Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian RRDtool Team Uploaders: Alexander Wirt , Jean-Michel Vourgère Standards-Version: 4.4.1 @@ -16,7 +17,6 @@ Build-Depends: dc, libpng-dev, libxml2-dev, perl (>= 5.8.0), - python3-all-dbg, python3-all-dev, python3-setuptools, tcl-dev (<= 9), @@ -155,29 +155,6 @@ Description: time-series data storage an . This package contains a Python3 interface to RRDs. -Package: python3-rrdtool-dbg -Architecture: any -Multi-Arch: same -Section: debug -Pre-Depends: ${misc:Pre-Depends} -Depends: python3-rrdtool (= ${binary:Version}), - ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends} -Provides: ${python3:Provides} -Breaks: rrdtool-dbg -Replaces: rrdtool-dbg -Description: time-series data storage and display system (Python3 debug interface) - The Round Robin Database Tool (RRDtool) is a system to store and display - time-series data (e.g. network bandwidth, machine-room temperature, - server load average). It stores the data in Round Robin Databases (RRDs), - a very compact way that will not expand over time. RRDtool processes the - extracted data to enforce a certain data density, allowing for useful - graphical representation of data values. - . - This package contains the Python3 debug interface to RRDs, and the debugging - symbols for both the non-debug and the debug python3 interfaces. - Package: ruby-rrd Architecture: any Multi-Arch: same diff -pruN 1.7.2-3/debian/patches/0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch 1.7.2-3ubuntu6/debian/patches/0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch --- 1.7.2-3/debian/patches/0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/patches/0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch 2022-01-26 21:13:40.000000000 +0000 @@ -0,0 +1,26 @@ +From bbfd34724e11bbb1f17c5598fa6202335e619674 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Wed, 26 Jan 2022 15:50:18 +1300 +Subject: [PATCH] clear LC_ALL when setting LC_TIME in rpn2 test + +This test was failing when LC_ALL was set to C.UTF-8 and using the C.UTF-8 locale which is part of glibc 2.35, which differs in a very minor way to that that has been used by Debian/Ubuntu for years. The tests sets LC_TIME to C, presumably to try to isolate itself from such things, but that does not have any effect if LC_ALL is set in the build environment. +--- + tests/rpn2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/rpn2 b/tests/rpn2 +index 9f9852f5..b64491d2 100755 +--- a/tests/rpn2 ++++ b/tests/rpn2 +@@ -16,7 +16,7 @@ report "create" + $RRDTOOL update $RRD 1167487200:0 1167494400:720 1167501600:1440 1167508800:2160 1167516000:2880 1167523200:3600 1167530400:4320 1167537600:5040 1167544800:5760 1167552000:6480 1167559200:7200 1167566400:7920 1167573600:8640 1167580800:9360 1167588000:10080 1167595200:10800 1167602400:11520 1167609600:12240 1167616800:12960 + + report "update" +-LC_TIME=C TZ=Europe/Zurich $RRDTOOL xport \ ++LC_ALL= LC_TIME=C TZ=Europe/Zurich $RRDTOOL xport \ + --json \ + --start 1167487200 --end 1167616800 \ + DEF:myspeed=$RRD:speed:AVERAGE \ +-- +2.32.0 + diff -pruN 1.7.2-3/debian/patches/series 1.7.2-3ubuntu6/debian/patches/series --- 1.7.2-3/debian/patches/series 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/patches/series 2022-01-26 21:13:40.000000000 +0000 @@ -1,2 +1,3 @@ no-rpath-for-ruby breaks-long-man-lines +0001-clear-LC_ALL-when-setting-LC_TIME-in-rpn2-test.patch diff -pruN 1.7.2-3/debian/python3-rrdtool-dbg.install 1.7.2-3ubuntu6/debian/python3-rrdtool-dbg.install --- 1.7.2-3/debian/python3-rrdtool-dbg.install 2019-10-19 17:49:10.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/python3-rrdtool-dbg.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python3*/dist-packages/rrdtool*-[0-9][0-9]d[m-]*.so diff -pruN 1.7.2-3/debian/python3-rrdtool-dbg.lintian-overrides 1.7.2-3ubuntu6/debian/python3-rrdtool-dbg.lintian-overrides --- 1.7.2-3/debian/python3-rrdtool-dbg.lintian-overrides 2019-10-19 20:59:30.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/python3-rrdtool-dbg.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# This is a false positive: -# Logs show the gcc is properly invoked with -D_FORTIFY_SOURCE=2 and -O2 -hardening-no-fortify-functions diff -pruN 1.7.2-3/debian/python3-rrdtool.install 1.7.2-3ubuntu6/debian/python3-rrdtool.install --- 1.7.2-3/debian/python3-rrdtool.install 2019-10-19 17:49:24.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/python3-rrdtool.install 2022-01-25 02:41:38.000000000 +0000 @@ -1,3 +1,3 @@ usr/lib/python3*/dist-packages/rrdtool-*.egg-info -usr/lib/python3*/dist-packages/rrdtool*-[0-9][0-9][m-]*.so +usr/lib/python3*/dist-packages/rrdtool*.so usr/share/rrdtool/examples/stripes.py /usr/share/doc/python3-rrdtool/examples/ diff -pruN 1.7.2-3/debian/rules 1.7.2-3ubuntu6/debian/rules --- 1.7.2-3/debian/rules 2019-10-19 22:44:12.000000000 +0000 +++ 1.7.2-3ubuntu6/debian/rules 2022-01-25 02:41:38.000000000 +0000 @@ -96,7 +96,6 @@ override_dh_missing: dh_missing -X.la -X.txt -X.pod -Xsystemd --fail-missing override_dh_strip: - dh_strip --package=python3-rrdtool --dbg-package=python3-rrdtool-dbg dh_strip --no-package=python3-rrdtool --dbgsym-migration='rrdtool-dbg (<< 1.7.2-2~)' override_dh_gencontrol: