From 6ed68186cdcb55f05d5e98084d9f273791188faa Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 3 Jun 2014 12:09:44 +0200 Subject: [PATCH] merged from debian packaging --- debian/changelog | 267 ++++--------------------------------------------------- debian/control | 9 +- debian/rules | 2 +- 3 files changed, 24 insertions(+), 254 deletions(-) diff --git a/debian/changelog b/debian/changelog index 00060b2..5edfef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,27 +1,39 @@ -psensor (0.8.0.6-1ppatrusty1) trusty; urgency=low +psensor (1.0.2-1ppatrusty1) trusty; urgency=low * Bump trusty PPA - * debian/psensor.install - + don't autostart psensor by default. - -- Jean-Philippe Orsini Fri, 11 Apr 2014 08:54:21 +0200 + -- Jean-Philippe Orsini Tue, 3 Jun 2014 08:54:21 +0200 -psensor (0.8.0.6-1) unstable; urgency=low +psensor (1.0.2-1) unstable; urgency=low * New upstream release. - + fixed AppIndicator icons. (LP: #1290072) + + fixed AppIndicator icons. (LP: #1290072) (LP: #1310323) + removed webfont to fix lintian warning privacy-breach-generic. + fixed lintian warning source-is-missing due to minimized .js. * debian/control + switched to Standards-Version 3.9.5. + fixed indentation of build-depends section. + changed vcs headers, packaging maintained in git now. + + switch to dh-autoreconf (superset of autotools-dev). * debian/copyright + psensor/packaging copyright end date set to 2014. + jqplot (updated upstream) copyright end date set to 2013. + excanvas.js (removed upstream) copyright removed. + * debian/rules + + use autoreconf to update libtool and configure. (Closes: #749110) + * debian/patches/json-c-FTBFS-fix.patch + + droped, fixed upstream + * debian/psensor.install + + don't autostart psensor by default. (Closes: #728754) + + -- Jean-Philippe Orsini Mon, 02 Jun 2014 22:17:16 +0200 - -- Jean-Philippe Orsini Tue, 15 Apr 2014 03:40:40 -0400 +psensor (0.8.0.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update to build against current json-c. (Closes: #746145) + + -- Wookey Fri, 30 May 2014 16:41:37 +0000 psensor (0.8.0.4-1) unstable; urgency=low @@ -46,30 +58,6 @@ psensor (0.8.0.4-1) unstable; urgency=low -- Jean-Philippe Orsini Fri, 20 Sep 2013 19:39:45 -0400 -psensor (0.8.0.3-2ubuntu1) saucy; urgency=low - - * Merge from Debian unstable, remaining Ubuntu changes: - - Build depend on nvidia-settings build-dep on i386 and amd64. - - Build depend on libunity-dev and libappindicator3-dev for Unity support. - - -- Jean-Philippe Orsini Mon, 30 Sep 2013 13:14:05 +0200 - -psensor (0.8.0.3-2) unstable; urgency=low - - * debian/control - + exclude build dep to atasmart lib for hurd and kfreebsd - - -- Jean-Philippe Orsini Sun, 08 Sep 2013 06:36:33 -0400 - -psensor (0.8.0.3-1ubuntu1) saucy; urgency=low - - * Merge from Debian unstable, remaining Ubuntu changes: - - Build depend on nvidia-settings build-dep on i386 and amd64. - - Build depend on libunity-dev and libappindicator3-dev for Unity support. - * Drop debian/patches/allow_gtk_deprecates.patch, it's fixed in debian - - -- Jackson Doak Mon, 27 May 2013 21:44:21 +0000 - psensor (0.8.0.3-2) unstable; urgency=low * debian/control @@ -99,25 +87,6 @@ psensor (0.8.0.3-1) unstable; urgency=low -- Jean-Philippe Orsini Sat, 25 May 2013 04:16:57 -0400 -psensor (0.7.0.3-1ubuntu2) saucy; urgency=low - - * added debian/patches/allow_gtk_deprecates.patch: to workaround - compilation failure with new gtk release. (LP: #1184442) - * debian/control: switched to 3.9.4 Standards Version. - * Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - + Only add an nvidia-settings build-dep on i386 and amd6 - - -- Jean-Philippe Orsini Mon, 27 May 2013 00:45:33 +0200 - -psensor (0.7.0.3-1ubuntu1) raring; urgency=low - - * Merge from Debian unstable, remaining Ubuntu changes: - - Build depend on nvidia-settings build-dep on i386 and amd64. - - Build depend on libunity-dev and libappindicator3-dev for Unity support. - - -- Andrew Starr-Bochicchio Sun, 27 Jan 2013 19:04:44 -0500 - psensor (0.7.0.3-1) unstable; urgency=low * New upstream release. @@ -143,29 +112,6 @@ psensor (0.7.0.3-1) unstable; urgency=low -- Jean-Philippe Orsini Sun, 19 Aug 2012 04:26:27 -0400 -psensor (0.6.2.19-0ubuntu1) quantal; urgency=low - - * New upstream release - + fixed hide window on startup for gnome-shell. (Closes: #676361) - + fixed size of the icon hicolor/48x48/psensor_hot.png. (LP: #1029065) - * Removed LP1021900.patch: fixed upstream since 0.6.2.18. - * Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - + Only add an nvidia-settings build-dep on i386 and amd6 - - -- Jean-Philippe Orsini Tue, 21 Aug 2012 11:19:33 +0200 - -psensor (0.6.2.17-2ubuntu1) quantal; urgency=low - - * Merge from Debian testing. Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - + Only add an nvidia-settings build-dep on i386 and amd6 - + debian/patches/LP1021900.patch: added degree Celcius symbol - * Remove drop_g_thread_init.patch: fixed upstream since 0.6.2.17 - * Remove LP968912.patch: fixed upstream since 0.6.2.17 - - -- Jean-Philippe Orsini Fri, 13 Jul 2012 02:22:18 +0200 - psensor (0.6.2.17-2) unstable; urgency=low * debian/control @@ -185,53 +131,6 @@ psensor (0.6.2.17-1) unstable; urgency=low -- Jean-Philippe Orsini Mon, 26 Mar 2012 05:14:19 -0400 -psensor (0.6.2.16-1ubuntu6) quantal; urgency=low - - * debian/patches/LP1021900.patch - - added degree Celcius symbol. (LP: #1021900) - - -- Jean-Philippe Orsini Sat, 07 Jul 2012 00:47:44 +0200 - -psensor (0.6.2.16-1ubuntu5) quantal; urgency=low - - * No change upload to get the latest version of libmicrohttpd. - - -- Chris J Arges Fri, 15 Jun 2012 08:26:04 -0500 - -psensor (0.6.2.16-1ubuntu4) precise; urgency=low - - * debian/patches/LP968912.patch - - fixed displayed sensor type. (LP: #968912) - - -- Jean-Philippe Orsini Fri, 30 Mar 2012 09:07:58 +0200 - -psensor (0.6.2.16-1ubuntu3) precise; urgency=low - - * debian/control - + Modified build-dep to add libunity-dev. (Closes LP: #919962) - + Applied wrap-and-sort. - - -- Jean-Philippe Orsini Sun, 22 Jan 2012 14:13:21 +0100 - -psensor (0.6.2.16-1ubuntu2) precise; urgency=low - - * debian/control - + Modified build-dep to libappindicator3-dev. (Closes LP: #919959) - - -- Jean-Philippe Orsini Sun, 22 Jan 2012 12:24:13 +0100 - -psensor (0.6.2.16-1ubuntu1) precise; urgency=low - - * Merge from Debian testing. Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - + Only add an nvidia-settings build-dep on i386 and amd64 - - * Add a patch to drop the deprecated g_thread_init() call - - add debian/patches/drop_g_thread_init.patch - - add debian/patches/series - - -- Micah Gersten Sat, 21 Jan 2012 22:41:34 -0600 - psensor (0.6.2.16-1) unstable; urgency=low * New upstream release. @@ -273,14 +172,6 @@ psensor (0.6.2.14-1) unstable; urgency=low -- Jean-Philippe Orsini Fri, 25 Nov 2011 02:56:22 -0500 -psensor (0.6.1.9-3ubuntu1) precise; urgency=low - - * Merge from Debian testing. Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - + Only add an nvidia-settings build-dep on i386 and amd64 - - -- Micah Gersten Wed, 26 Oct 2011 04:46:38 -0500 - psensor (0.6.1.9-3) unstable; urgency=low * debian/copyright: @@ -288,22 +179,6 @@ psensor (0.6.1.9-3) unstable; urgency=low -- Jean-Philippe Orsini Mon, 12 Sep 2011 05:47:02 -0400 -psensor (0.6.1.9-2ubuntu2) oneiric; urgency=low - - * Only add an nvidia-settings build-dep on i386 and amd64 since these are the - only two arches this package exists on - - update debian/control - - -- Micah Gersten Fri, 10 Jun 2011 02:25:53 -0500 - -psensor (0.6.1.9-2ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. Remaining changes: - + Modifed build-dep to add NVidia and Application Indicator support - (LP: #793443). - - -- Jean-Philippe Orsini Tue, 07 Jun 2011 02:41:01 -0500 - psensor (0.6.1.9-2) unstable; urgency=low * debian/psensor-server.install: @@ -319,15 +194,6 @@ psensor (0.6.1.9-1) unstable; urgency=low -- Jean-Philippe Orsini Tue, 03 May 2011 11:26:03 +0200 -psensor (0.6.1.8-1ubuntu1) oneiric; urgency=low - - * debian/control: - - added build-dep nvidia-settings and libappindicator-dev. It allows - psensor to monitor NVidia GPUs and to use Ubuntu Application Indicator - (LP: #778415). - - -- Jean-Philippe Orsini Sat, 14 May 2011 18:04:25 +0200 - psensor (0.6.1.8-1) unstable; urgency=low * New upstream release. @@ -356,98 +222,3 @@ psensor (0.6.1.5-1) unstable; urgency=low * Initial release. -- Jean-Philippe Orsini Sun, 20 Feb 2011 15:15:30 +0100 - -psensor (0.6.1.5-0ubuntu1) maverick; urgency=low - - * New upstream release - - -- Jean-Philippe Orsini Thu, 17 Feb 2011 02:15:50 +0100 - -psensor (0.6.1.4-0ubuntu1) maverick; urgency=low - - * New upstream release - - -- Jean-Philippe Orsini Wed, 16 Feb 2011 19:17:18 +0100 - -psensor (0.6.1.3-1) maverick; urgency=low - - * upgrade upstream - * removed debian/tmp in .install files - * improved long description of the packages - * fixed debian/copyright(add real name and license preamble) - * use dh_installman - * added debian/watch file - - -- Jean-Philippe Orsini Wed, 16 Feb 2011 09:56:05 +0100 - -psensor (0.6.1.1-3) lucid; urgency=low - - * bump lucid - - -- jeanfi Tue, 15 Feb 2011 12:10:08 +0100 - -psensor (0.6.1.1-2) natty; urgency=low - - * bump natty - - -- jeanfi Tue, 15 Feb 2011 12:09:19 +0100 - -psensor (0.6.1.1-1) maverick; urgency=low - - * upgrade upstream - - -- jeanfi Tue, 15 Feb 2011 11:41:38 +0100 - -psensor (0.6.1-4) natty; urgency=low - - * bump natty - - -- jeanfi Mon, 14 Feb 2011 12:18:28 +0100 - -psensor (0.6.1-3) lucid; urgency=low - - * bump lucid - - -- jeanfi Mon, 14 Feb 2011 12:17:37 +0100 - -psensor (0.6.1-2) maverick; urgency=low - - * fixed file conflicts concerning doc dir - - -- jeanfi Mon, 14 Feb 2011 11:47:16 +0100 - -psensor (0.6.1-1) maverick; urgency=low - - * upgrade upstream - - -- jeanfi Mon, 14 Feb 2011 10:52:24 +0100 - -psensor (0.6.0.14-5) karmic; urgency=low - - * bump karmic - - -- jeanfi Sun, 13 Feb 2011 14:05:07 +0100 - -psensor (0.6.0.14-4) maverick; urgency=low - - * www/index.lua in the psensor-server package - - -- jeanfi Sun, 13 Feb 2011 13:30:30 +0100 - -psensor (0.6.0.14-3) lucid; urgency=low - - * bump lucid - - -- jeanfi Sat, 12 Feb 2011 21:18:22 +0100 - -psensor (0.6.0.14-2) natty; urgency=low - - * bump natty - - -- jeanfi Sat, 12 Feb 2011 21:16:38 +0100 - -psensor (0.6.0.14-1) maverick; urgency=low - - * upgrade upstream - - -- jeanfi Sat, 12 Feb 2011 14:34:42 +0100 diff --git a/debian/control b/debian/control index 9f47fed..3471ed9 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,12 @@ Source: psensor Section: utils Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jean-Philippe Orsini +Maintainer: Jean-Philippe Orsini Build-Depends: asciidoc, autoconf, - automake1.11, + automake, autopoint, - autotools-dev, + dh-autoreconf, cppcheck, debhelper (>= 9), gettext, @@ -18,7 +17,7 @@ Build-Depends: asciidoc, libgconf2-dev, libgtk-3-dev, libgtop2-dev, - libjson0-dev, + libjson-c-dev, libmicrohttpd-dev, libnotify-dev, libsensors4-dev, diff --git a/debian/rules b/debian/rules index 1006222..1a9bfb1 100755 --- a/debian/rules +++ b/debian/rules @@ -11,4 +11,4 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %: - dh $@ --with=autotools_dev + dh $@ --with=autoreconf -- 2.7.4