diff -pruN 3.0.0+git6-0.5/debian/changelog 3.0.0+git6-0.5ubuntu1/debian/changelog --- 3.0.0+git6-0.5/debian/changelog 2020-10-15 17:44:32.000000000 +0000 +++ 3.0.0+git6-0.5ubuntu1/debian/changelog 2021-02-05 14:36:19.000000000 +0000 @@ -1,3 +1,13 @@ +sensors-applet (3.0.0+git6-0.5ubuntu1) hirsute; urgency=medium + + * Resynchronize on Debian, remaining Ubuntu changes + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Sebastien Bacher Fri, 05 Feb 2021 15:36:19 +0100 + sensors-applet (3.0.0+git6-0.5) unstable; urgency=medium * Non-maintainer upload. @@ -6,6 +16,22 @@ sensors-applet (3.0.0+git6-0.5) unstable -- Dmitry Shachnev Thu, 15 Oct 2020 20:44:32 +0300 +sensors-applet (3.0.0+git6-0.4ubuntu2) groovy; urgency=medium + + * Install libsensors-applet.so in the multi-arch location. + + -- Dmitry Shachnev Sat, 22 Aug 2020 11:36:09 +0300 + +sensors-applet (3.0.0+git6-0.4ubuntu1) groovy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Logan Rosen Wed, 10 Jun 2020 21:48:52 -0400 + sensors-applet (3.0.0+git6-0.4) unstable; urgency=medium * Non-maintainer upload. @@ -16,6 +42,16 @@ sensors-applet (3.0.0+git6-0.4) unstable -- Dmitry Shachnev Fri, 05 Jun 2020 13:18:41 +0300 +sensors-applet (3.0.0+git6-0.3ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Logan Rosen Tue, 18 Feb 2020 22:02:09 -0500 + sensors-applet (3.0.0+git6-0.3) unstable; urgency=medium * Non-maintainer upload. @@ -23,6 +59,22 @@ sensors-applet (3.0.0+git6-0.3) unstable -- Andreas Henriksson Fri, 07 Feb 2020 18:56:10 +0100 +sensors-applet (3.0.0+git6-0.2ubuntu2) disco; urgency=medium + + * No-change rebuild against latest lm-sensors + + -- Jeremy Bicha Wed, 02 Jan 2019 18:33:09 -0500 + +sensors-applet (3.0.0+git6-0.2ubuntu1) disco; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Logan Rosen Fri, 09 Nov 2018 21:49:29 -0500 + sensors-applet (3.0.0+git6-0.2) unstable; urgency=medium * Non-maintainer upload @@ -31,6 +83,34 @@ sensors-applet (3.0.0+git6-0.2) unstable -- Jeremy Bicha Sun, 21 Oct 2018 22:17:01 -0400 +sensors-applet (3.0.0+git6-0.1ubuntu4) cosmic; urgency=medium + + * No-change rebuild due to libpanel-applet-dev removal on s390x. + + -- Adam Conrad Tue, 16 Oct 2018 12:05:28 -0600 + +sensors-applet (3.0.0+git6-0.1ubuntu3) artful; urgency=medium + + * No-change rebuild against libpanel-applet3. + + -- Dmitry Shachnev Tue, 25 Apr 2017 15:03:04 +0300 + +sensors-applet (3.0.0+git6-0.1ubuntu2) zesty; urgency=medium + + * No-change rebuild against libpanel-applet2. + + -- Dmitry Shachnev Fri, 02 Dec 2016 16:41:23 +0300 + +sensors-applet (3.0.0+git6-0.1ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Dmitry Shachnev Mon, 07 Nov 2016 20:14:34 +0300 + sensors-applet (3.0.0+git6-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -43,6 +123,16 @@ sensors-applet (3.0.0+git6-0.1) unstable -- Dmitry Shachnev Mon, 24 Oct 2016 13:07:40 +0300 +sensors-applet (3.0.0+git5-0.1ubuntu1) wily; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Dmitry Shachnev Thu, 25 Jun 2015 12:16:54 +0300 + sensors-applet (3.0.0+git5-0.1) unstable; urgency=medium * Non-maintainer upload, with maintainer's permission. @@ -52,6 +142,17 @@ sensors-applet (3.0.0+git5-0.1) unstable -- Dmitry Shachnev Wed, 24 Jun 2015 20:36:00 +0300 +sensors-applet (3.0.0+git4-4ubuntu1) utopic; urgency=medium + + * Merge from debian. Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + * Use debian's enable-deprecated patch + + -- Jackson Doak Sat, 21 Jun 2014 13:00:50 +1000 + sensors-applet (3.0.0+git4-4) unstable; urgency=medium * enable-deprecated.patch: avoid removing AC_SUBST(CFLAGS). @@ -64,6 +165,23 @@ sensors-applet (3.0.0+git4-3) unstable; -- Sam Morris Sun, 16 Mar 2014 20:20:30 +0000 +sensors-applet (3.0.0+git4-2ubuntu2) trusty; urgency=low + + * d/p/enable-deprecated: permit use of deprecated parts of GTK to fix FTBFS, + since panel-applet.h uses GtkActionGroup which is now deprecated. + + -- Robie Basak Wed, 18 Dec 2013 06:03:22 -0500 + +sensors-applet (3.0.0+git4-2ubuntu1) trusty; urgency=low + + * Merge from debian. Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Jackson Doak Tue, 03 Dec 2013 07:25:56 +1100 + sensors-applet (3.0.0+git4-2) unstable; urgency=low * Re-enable -Wl,--as-needed; the dh-autoreconf optino enables support for @@ -114,6 +232,16 @@ sensors-applet (3.0.0-1) unstable; urgen -- Sam Morris Sat, 22 Jun 2013 20:37:40 +0100 +sensors-applet (3.0.0-0.2ubuntu1) quantal; urgency=low + + * Merge from debian unstable (LP: #1049343). Remaining changes: + - debian/rules: + + Enable nvidia compilation flag. + - debian/control: + + Build-depend on nvidia-settings and update description accordingly. + + -- Darxus Sun, 30 Sep 2012 11:21:31 -0400 + sensors-applet (3.0.0-0.2) unstable; urgency=low * Non-maintainer upload. diff -pruN 3.0.0+git6-0.5/debian/control 3.0.0+git6-0.5ubuntu1/debian/control --- 3.0.0+git6-0.5/debian/control 2020-10-15 17:44:32.000000000 +0000 +++ 3.0.0+git6-0.5ubuntu1/debian/control 2021-02-05 14:36:19.000000000 +0000 @@ -1,7 +1,8 @@ Source: sensors-applet Section: gnome Priority: optional -Maintainer: Sam Morris +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sam Morris Uploaders: Filippo Giunchedi Build-Depends: debhelper (>= 11), @@ -18,6 +19,7 @@ Build-Depends: libsensors-dev, libx11-dev, libtool, + nvidia-settings (>= 173.14.09-1ubuntu2) [amd64 i386], xsltproc, yelp-tools Standards-Version: 3.7.3 @@ -42,7 +44,7 @@ Description: Display readings from hardw * Linux kernel iMac G5 Windfarm module * hddtemp daemon for reading temperatures from S.M.A.R.T. equipped hard disks * Linux kernel Omnibook module - * NVIDIA graphics cards (with separate sensors-applet-nvidia package) + * NVIDIA graphics cards (supplied with nvidia-settings) * Linux kernel sonypi module (for Sony Vaio laptops) . Alarms can be set for each sensor to notify the user once a certain high or diff -pruN 3.0.0+git6-0.5/debian/rules 3.0.0+git6-0.5ubuntu1/debian/rules --- 3.0.0+git6-0.5/debian/rules 2020-10-15 17:44:32.000000000 +0000 +++ 3.0.0+git6-0.5ubuntu1/debian/rules 2021-02-05 14:36:19.000000000 +0000 @@ -14,6 +14,9 @@ DEB_HOST_MULTIARCH := $(shell dpkg-archi # to avoid this conflict. confflags += --libexecdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)/sensors-applet' +# enable nvidia support +confflags += --with-nvidia=yes + %: dh $@