diff -Nru procmeter3-3.6/debian/changelog procmeter3-3.6/debian/changelog --- procmeter3-3.6/debian/changelog 2019-01-02 23:32:22.000000000 +0000 +++ procmeter3-3.6/debian/changelog 2019-01-05 18:04:01.000000000 +0000 @@ -1,8 +1,29 @@ -procmeter3 (3.6-1.1build1) disco; urgency=medium +procmeter3 (3.6-2) unstable; urgency=medium - * No-change rebuild against latest lm-sensors + * Add co-maintainer. + * Bump debhelper compat level to 11. + * debian/copyright: + - Update Format URL to use https. + - Update copyright holders information. + * debian/control: + - Update Vcs-* fields to use salsa.debian.org. + - Update Upstream Homepage. + * debian/watch: Update to use secure URI. + * Bump Standards-Version to 4.3.0: + - debian/control: Document Rules-Requires-Root field. + + -- Josue Ortega Sat, 05 Jan 2019 12:04:01 -0600 + +procmeter3 (3.6-1.2) unstable; urgency=medium - -- Jeremy Bicha Wed, 02 Jan 2019 18:32:22 -0500 + * Non-maintainer upload. + * debian/patches/libsensors5.patch + + Update checks for libsensors5 Closes: #918078. + * debian/control + + Replace libsensors4-dev build-depends by libsensors-dev Closes: + #917446. + + -- Aurelien Jarno Thu, 03 Jan 2019 16:06:56 +0100 procmeter3 (3.6-1.1) unstable; urgency=medium @@ -154,7 +175,7 @@ * Merge acpi changes from wmbattery: - Deal with batteries that report they're charged to greater than their - max capacity. + max capacity. - Patch from Christian Schäfer to add support for using on acpi systems with no batteries. - guard against potential division by zero. Closes: #454766 @@ -385,7 +406,7 @@ procmeter3 (3.3a-8) unstable; urgency=low - * Corrected segfault if there is a /proc/acpi/ without a status file in it. + * Corrected segfault if there is a /proc/acpi/ without a status file in it. How that can happen, I do not know. Closes: #148671 -- Joey Hess Fri, 31 May 2002 21:32:19 -0400 @@ -451,7 +472,7 @@ * Added build-depends on xlibs-dev, Closes: #80184 This should be redundant, since on i386 anyway, xlib6g-dev (which it already build-depends on) depends on xlibs-dev. Whatever. This will - wake the m68k guys up and have them try to build it again, hopefully on + wake the m68k guys up and have them try to build it again, hopefully on a system that is running unstable, not some ancient system that still has xpm4g-dev. @@ -459,7 +480,7 @@ procmeter3 (3.3-2) unstable; urgency=low - * Tightened gtk build dep, Closes: #81929 + * Tightened gtk build dep, Closes: #81929 -- Joey Hess Thu, 11 Jan 2001 10:35:52 -0800 @@ -773,4 +794,3 @@ * Initial release -- Joey Hess Wed, 21 Aug 1996 15:37:25 -0400 - diff -Nru procmeter3-3.6/debian/compat procmeter3-3.6/debian/compat --- procmeter3-3.6/debian/compat 2014-03-22 15:38:22.000000000 +0000 +++ procmeter3-3.6/debian/compat 2019-01-05 18:04:01.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru procmeter3-3.6/debian/control procmeter3-3.6/debian/control --- procmeter3-3.6/debian/control 2014-03-22 15:38:22.000000000 +0000 +++ procmeter3-3.6/debian/control 2019-01-05 18:04:01.000000000 +0000 @@ -1,14 +1,22 @@ Source: procmeter3 Section: utils Priority: optional -Build-Depends: debhelper (>= 9), libgtk2.0-dev, libx11-dev, libxt-dev, - x11proto-core-dev, libsensors4-dev, libxaw7-dev, - dpkg-dev (>= 1.17.0), libgtk-3-dev +Build-Depends: debhelper (>= 11), + libgtk2.0-dev, + libx11-dev, + libxt-dev, + x11proto-core-dev, + libsensors-dev, + libxaw7-dev, + dpkg-dev (>= 1.17.0), + libgtk-3-dev Maintainer: Wences Arana -Standards-Version: 3.9.5 -Homepage: http://www.gedanken.demon.co.uk/procmeter3/ -Vcs-Git: git://anonscm.debian.org/collab-maint/procmeter3.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/procmeter3.git +Uploaders: Josue Ortega +Standards-Version: 4.3.0 +Homepage: https://www.gedanken.org.uk/software/procmeter3/ +Vcs-Git: https://salsa.debian.org/debian/procmeter3.git +Vcs-Browser: https://salsa.debian.org/debian/procmeter3 +Rules-Requires-Root: no Package: procmeter3 Architecture: any diff -Nru procmeter3-3.6/debian/copyright procmeter3-3.6/debian/copyright --- procmeter3-3.6/debian/copyright 2014-03-22 15:38:22.000000000 +0000 +++ procmeter3-3.6/debian/copyright 2019-01-05 18:04:01.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: procmeter3 Source: http://www.gedanken.org.uk/software/procmeter3/download/ @@ -25,8 +25,9 @@ License: GPL-2+ Files: debian/* -Copyright: 2010, Wences Rene Arana Fuentes - 1996-2008, Joey Hess +Copyright: 2019, Josue Ortega + 2010, Wences Rene Arana Fuentes + 1996-2008, Joey Hess License: GPL-2+ License: GPL-2+ diff -Nru procmeter3-3.6/debian/patches/libsensors5.patch procmeter3-3.6/debian/patches/libsensors5.patch --- procmeter3-3.6/debian/patches/libsensors5.patch 1970-01-01 00:00:00.000000000 +0000 +++ procmeter3-3.6/debian/patches/libsensors5.patch 2019-01-05 18:04:01.000000000 +0000 @@ -0,0 +1,27 @@ +Add support for the libsensors5 API. In practice it's just a matter of +updating the version checks. + +--- procmeter3-3.6.orig/modules/check-no-libsensors.sh ++++ procmeter3-3.6/modules/check-no-libsensors.sh +@@ -5,7 +5,7 @@ CFLAGS=$2 + + cat < libsensors-test.c + #include +-#if (SENSORS_API_VERSION & 0xf00) != 0x400 ++#if (SENSORS_API_VERSION & 0xf00) != 0x500 + #error + #endif + EOF +--- procmeter3-3.6.orig/modules/libsensors-fan.c ++++ procmeter3-3.6/modules/libsensors-fan.c +@@ -27,8 +27,8 @@ const char *FILE__=__FILE__; + + #include "procmeter.h" + +-#if !defined(SENSORS_API_VERSION) || (SENSORS_API_VERSION & 0xf00) != 0x400 +-#error "This module requires libsensors version 3" ++#if !defined(SENSORS_API_VERSION) || (SENSORS_API_VERSION & 0xf00) != 0x500 ++#error "This module requires libsensors version 5" + #else + + /* The interface information. */ diff -Nru procmeter3-3.6/debian/patches/series procmeter3-3.6/debian/patches/series --- procmeter3-3.6/debian/patches/series 2018-12-21 21:51:43.000000000 +0000 +++ procmeter3-3.6/debian/patches/series 2019-01-05 18:04:01.000000000 +0000 @@ -7,3 +7,4 @@ dont-override-flags.patch libX11.patch loff_t.patch +libsensors5.patch diff -Nru procmeter3-3.6/debian/rules procmeter3-3.6/debian/rules --- procmeter3-3.6/debian/rules 2014-03-22 15:38:22.000000000 +0000 +++ procmeter3-3.6/debian/rules 2019-01-05 18:04:01.000000000 +0000 @@ -21,4 +21,4 @@ override_dh_installdocs: dh_installdocs cp modules/README \ - $(CURDIR)/debian/procmeter3/usr/share/doc/procmeter3/README.modules \ No newline at end of file + $(CURDIR)/debian/procmeter3/usr/share/doc/procmeter3/README.modules diff -Nru procmeter3-3.6/debian/watch procmeter3-3.6/debian/watch --- procmeter3-3.6/debian/watch 2014-03-22 15:38:22.000000000 +0000 +++ procmeter3-3.6/debian/watch 2019-01-05 18:04:01.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://www.gedanken.org.uk/software/procmeter3/download/procmeter3-([^\+]*).tgz \ No newline at end of file +https://www.gedanken.org.uk/software/procmeter3/download/procmeter3-([^\+]*).tgz \ No newline at end of file