diff -pruN 1.7.2-3/debian/changelog 1.7.2-4/debian/changelog --- 1.7.2-3/debian/changelog 2019-10-31 08:51:05.000000000 +0000 +++ 1.7.2-4/debian/changelog 2021-11-18 16:35:17.000000000 +0000 @@ -1,3 +1,24 @@ +rrdtool (1.7.2-4) unstable; urgency=medium + + [ Jean-Michel Vourgère ] + * Changed maintainer team address from alioth to tracker.d.o. + * d/copyright: Fixed tclrrd.c double entry. + * Bumped debhelper compat level to 13: + - librrds-perl.install and rrdtool-tcl.install use builtin variables + expansion. + - Dropped build-dependency on dh-exec. + - Removed --fail-missing in dh_missing, as it is now the default. + * Bumped d/watch to format 4. + * New patch python3_example. + * Drop package python3-rrdtool-dbg. (Closes: #994376) + + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + * Wrap long lines in changelog entries: 1.0.42-2. + + -- Jean-Michel Vourgère Thu, 18 Nov 2021 17:35:17 +0100 + rrdtool (1.7.2-3) unstable; urgency=medium * Added Breaks+Replaces for debug symbols migration. (Closes: #943840) @@ -909,9 +930,9 @@ rrdtool (1.0.45-1) unstable; urgency=low rrdtool (1.0.42-2) unstable; urgency=low - * Build-Depends: libpng12-dev instead of libpng3-dev (when will the madness end?) - (Closes: #195224 - I hope this will also fix weird version mismatch problems (Closes: #194900) + * Build-Depends: libpng12-dev instead of libpng3-dev (when will the madness + end?) (Closes: #195224) I hope this will also fix weird version mismatch + problems (Closes: #194900) -- Matt Zimmerman Sat, 31 May 2003 15:06:42 -0400 diff -pruN 1.7.2-3/debian/control 1.7.2-4/debian/control --- 1.7.2-3/debian/control 2019-10-31 08:50:36.000000000 +0000 +++ 1.7.2-4/debian/control 2021-11-18 15:37:38.000000000 +0000 @@ -1,13 +1,12 @@ Source: rrdtool Section: utils Priority: optional -Maintainer: Debian RRDtool Team +Maintainer: Debian RRDtool Team Uploaders: Alexander Wirt , Jean-Michel Vourgère Standards-Version: 4.4.1 Build-Depends: dc, - debhelper-compat (= 12), - dh-exec (>=0.3), + debhelper-compat (= 13), dh-lua, dh-python, gem2deb, @@ -16,7 +15,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 +153,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/copyright 1.7.2-4/debian/copyright --- 1.7.2-3/debian/copyright 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-4/debian/copyright 2021-11-18 16:34:49.000000000 +0000 @@ -31,7 +31,7 @@ Copyright: 1999-2004 Matt Zimmerman 2014 Christian Hofstaedtler 2014 Damyan Ivanov - 2014-2019 Jean-Michel Vourgère + 2014-2021 Jean-Michel Vourgère License: GPL-2+ with FLOSS exception Files: debian/rrdcached.init @@ -64,7 +64,6 @@ Copyright: 1999,2000 Frank Strauss, Tech License: GPL-2+ with FLOSS exception Files: bindings/dotnet/* - bindings/tcl/tclrrd.c Copyright: 2010 Chris Larsen License: GPL-2+ with FLOSS exception @@ -289,28 +288,28 @@ License: GPL-2+ with FLOSS exception . FLOSS License List ================== - License name Version(s)/Copyright Date - Academic Free License 2.0 - Apache Software License 1.0/1.1/2.0 - Apple Public Source License 2.0 - Artistic license From Perl 5.8.0 - BSD license "July 22 1999" - Common Public License 1.0 - GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1 - IBM Public License, Version 1.0 - Jabber Open Source License 1.0 - MIT License (As listed in file MIT-License.txt) - - Mozilla Public License (MPL) 1.0/1.1 - Open Software License 2.0 - OpenSSL license (with original SSLeay license) "2003" ("1998") - PHP License 3.0 - Python license (CNRI Python License) - - Python Software Foundation License 2.1.1 - Sleepycat License "1999" - W3C License "2001" - X11 License "2001" - Zlib/libpng License - - Zope Public License 2.0 + License name Version(s)/Copyright Date + Academic Free License 2.0 + Apache Software License 1.0/1.1/2.0 + Apple Public Source License 2.0 + Artistic license From Perl 5.8.0 + BSD license "July 22 1999" + Common Public License 1.0 + GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1 + IBM Public License, Version 1.0 + Jabber Open Source License 1.0 + MIT License (As listed in file MIT-License.txt) - + Mozilla Public License (MPL) 1.0/1.1 + Open Software License 2.0 + OpenSSL license (with original SSLeay license) "2003" ("1998") + PHP License 3.0 + Python license (CNRI Python License) - + Python Software Foundation License 2.1.1 + Sleepycat License "1999" + W3C License "2001" + X11 License "2001" + Zlib/libpng License - + Zope Public License 2.0 License: MIT Permission is hereby granted, free of charge, to any person obtaining a diff -pruN 1.7.2-3/debian/librrds-perl.install 1.7.2-4/debian/librrds-perl.install --- 1.7.2-3/debian/librrds-perl.install 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-4/debian/librrds-perl.install 2020-12-28 14:09:19.000000000 +0000 @@ -1,8 +1,2 @@ -#!/usr/bin/perl -use Config; -# omit the leading '/' -my $vendorarch = substr( $Config{vendorarch}, 1 ); - -print "$vendorarch/auto/RRDs\n"; -print "$vendorarch/RRDs.pm\n"; -print "usr/share/man/man3/RRDs.3pm\n"; +usr/lib/${DEB_HOST_MULTIARCH}/perl* +usr/share/man/man3/RRDs.3pm diff -pruN 1.7.2-3/debian/patches/python3_example 1.7.2-4/debian/patches/python3_example --- 1.7.2-3/debian/patches/python3_example 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2-4/debian/patches/python3_example 2020-12-30 14:53:51.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Switch example script to use python3 +Author: Jean-Michel Vourgère +Applied-Upstream: commit:0df7b5a39a5f8747a5ab11a8c172c4644e6edd22 +Last-Update: 2020-12-30 + +--- rrdtool-1.7.2.orig/examples/stripes.py ++++ rrdtool-1.7.2/examples/stripes.py +@@ -1,6 +1,4 @@ +-#! /usr/bin/python +- +-from __future__ import print_function ++#! /usr/bin/python3 + + import locale + import random diff -pruN 1.7.2-3/debian/patches/series 1.7.2-4/debian/patches/series --- 1.7.2-3/debian/patches/series 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-4/debian/patches/series 2020-12-28 15:40:00.000000000 +0000 @@ -1,2 +1,3 @@ no-rpath-for-ruby breaks-long-man-lines +python3_example diff -pruN 1.7.2-3/debian/python3-rrdtool-dbg.install 1.7.2-4/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-4/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-4/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-4/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-4/debian/python3-rrdtool.install --- 1.7.2-3/debian/python3-rrdtool.install 2019-10-19 17:49:24.000000000 +0000 +++ 1.7.2-4/debian/python3-rrdtool.install 2021-11-18 15:37: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/rrdtool.lintian-overrides 1.7.2-4/debian/rrdtool.lintian-overrides --- 1.7.2-3/debian/rrdtool.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2-4/debian/rrdtool.lintian-overrides 2020-12-28 15:02:01.000000000 +0000 @@ -0,0 +1,2 @@ +# Lintian is confused by ${prefix} usage +bin-sbin-mismatch usr/share/doc/rrdtool/examples/piped-demo.pl bin/rrdtool -> usr/bin/rrdtool diff -pruN 1.7.2-3/debian/rrdtool-tcl.install 1.7.2-4/debian/rrdtool-tcl.install --- 1.7.2-3/debian/rrdtool-tcl.install 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-4/debian/rrdtool-tcl.install 2020-12-28 13:45:57.000000000 +0000 @@ -1,3 +1,2 @@ -#!/usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/tcl* usr/lib/tcltk/${DEB_HOST_MULTIARCH}/rrdtool-tcl/ usr/lib/${DEB_HOST_MULTIARCH}/rrdtool/pkgIndex.tcl usr/lib/tcltk/${DEB_HOST_MULTIARCH}/rrdtool-tcl/ diff -pruN 1.7.2-3/debian/rules 1.7.2-4/debian/rules --- 1.7.2-3/debian/rules 2019-10-19 22:44:12.000000000 +0000 +++ 1.7.2-4/debian/rules 2021-11-18 15:37:38.000000000 +0000 @@ -93,10 +93,10 @@ override_dh_installdocs: dh_installdocs -A CONTRIBUTORS NEWS override_dh_missing: - dh_missing -X.la -X.txt -X.pod -Xsystemd --fail-missing + dh_missing -X.la -X.txt -X.pod -Xsystemd override_dh_strip: - dh_strip --package=python3-rrdtool --dbg-package=python3-rrdtool-dbg + dh_strip --package=python3-rrdtool --dbgsym-migration='rrdtool-dbg (<< 1.7.2-4~)' dh_strip --no-package=python3-rrdtool --dbgsym-migration='rrdtool-dbg (<< 1.7.2-2~)' override_dh_gencontrol: diff -pruN 1.7.2-3/debian/upstream/metadata 1.7.2-4/debian/upstream/metadata --- 1.7.2-3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2-4/debian/upstream/metadata 2020-12-29 06:48:11.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/oetiker/rrdtool-1.x/issues +Bug-Submit: https://github.com/oetiker/rrdtool-1.x/issues/new +Repository: https://github.com/oetiker/rrdtool-1.x.git +Repository-Browse: https://github.com/oetiker/rrdtool-1.x diff -pruN 1.7.2-3/debian/watch 1.7.2-4/debian/watch --- 1.7.2-3/debian/watch 2019-09-01 13:55:56.000000000 +0000 +++ 1.7.2-4/debian/watch 2020-12-28 14:33:34.000000000 +0000 @@ -1,3 +1,5 @@ -version=3 +version=4 + opts=uversionmangle=s/-(rc\d*)$/~$1/ \ -https://github.com/oetiker/rrdtool-1.x/tags/ .*/v(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz)) + https://github.com/oetiker/@PACKAGE@-1.x/tags/ \ + .*/v@ANY_VERSION@@ARCHIVE_EXT@