From: Jean-Philippe Orsini Date: Mon, 1 Sep 2014 12:30:44 +0000 (+0200) Subject: Merge tag 'upstream/1.1.1' X-Git-Tag: debian/1.1.3-1ppautopic1~12 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=4c01ba89aac969b4c19190dd8f27329b5dd24a6e;hp=4c50d430bea4b8462b0ae7ab70baf3f538f87718 Merge tag 'upstream/1.1.1' Upstream version 1.1.1 --- diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ab211cf --- /dev/null +++ b/debian/changelog @@ -0,0 +1,233 @@ +psensor (1.0.4-1ppatrusty1) trusty; urgency=medium + + * New upstream release. + + -- Jean-Philippe Orsini Wed, 13 Aug 2014 20:20:02 +0200 + +psensor (1.0.3-1ppatrusty1) trusty; urgency=medium + + * New upstream release. + + Fixed psensor does not start: Attempt to unlock mutex that was + not locked during startup with glib 2.41.2. (LP: #1346299). + + Fixed FTBFS with clang instead of gcc. (Closes: #753061). + + -- Jean-Philippe Orsini Tue, 05 Aug 2014 18:49:07 +0200 + +psensor (1.0.2-1ppatrusty1) trusty; urgency=low + + * New upstream release. + + 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 + +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 + + * New upstream release. + * debian/control + + added dep to autotools-dev to regenerate config.{guess,sub}. + + added vcs fields. + + fixed ordering of build-deps. + + longer description for psensor-common. + * debian/copyright + + copyright end date set to 2013. + * debian/psensor*.lintian-overrides + + ignored no-upstream-change lintian warnings as + upstream does not provide it. + * removed debian/docs because there are multiple bin packages. + * debian/psensor-common.install + + added README. + * debian/psensor-common.doc-base.manual + + registered to doc-base. + * debian/rules + + regenerate config.{guess,sub} automatically. (Closes: #727950) + + -- Jean-Philippe Orsini Fri, 20 Sep 2013 19:39:45 -0400 + +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-1) unstable; urgency=low + + * New upstream release. + + fixed realloc null returned value not handled in amd.c. + + fixed url var in main function not freed. + + added message when no sensor graphs are enabled. (Closes: #689355) + + replaced deprecated GtkColorSelectionDialog by GtkColorChooserDialog. + to avoid build failure with recent GTK releases. (LP: #1184442) + * debian/control + + added builddep to cppcheck. + + added builddep to asciidoc. + + added mention of FAQ in the psensor-common description. + + added mention of libatasmart support in psensor description. + + replaced builddep libjson0-dev by libjson-c-dev. + + switched to Standards-Version 3.9.4. + * debian/psensor-common.install + + added faq.txt and faq.html. + * debian/psensor.install + + added psensor.glade. + + -- Jean-Philippe Orsini Sat, 25 May 2013 04:16:57 -0400 + +psensor (0.7.0.3-1) unstable; urgency=low + + * New upstream release. + + added gconf schema. (LP: #1026807) + + fixed systray and application indicator visible at the + same time. (LP: #971098) + + fixed wrong background color, get the background color of + the window and not the canvas widget. (LP: #973122) + + removed hicolor/48x48/psensor_hot.png. (LP: #1029065) + + added degree sign for celcius. (LP: #1021900) + + fixed hide window on startup for gnome-shell. (Closes: #676361) + * debian/control + + added builddep to libatasmart-dev. + + switched to debhelper 9. + * debian/psensor.install + + added gconf schema. + * debian/rules + + set GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL to 1 to avoid gconf + schema installation during package build. + * debian/compat + + switched to debhelper 9, fixes hardening-no-relro and + hardening-no-fortify-functions lintian warnings. + + -- Jean-Philippe Orsini Sun, 19 Aug 2012 04:26:27 -0400 + +psensor (0.6.2.17-2) unstable; urgency=low + + * debian/control + - replaced libcurl4-openssl-dev build dep to + libcurl4-gnutls-dev. (Closes: #668180) + + -- Jean-Philippe Orsini Mon, 09 Apr 2012 12:15:54 -0400 + +psensor (0.6.2.17-1) unstable; urgency=low + + * New upstream release. + - Fixed sensor type displayed in sensor preferences. (Closes LP: #968912) + * debian/control + - Switched to Standards-Version 3.9.3. + * debian/copyright + - Changed end date to 2012. + + -- Jean-Philippe Orsini Mon, 26 Mar 2012 05:14:19 -0400 + +psensor (0.6.2.16-1) unstable; urgency=low + + * New upstream release. + - removed -pedantic compilation option. (Closes LP: #905893) + * debian/control, debian/psensor.install, debian/psensor-server.install: + - applied wrap-and-sort. (Closes: #652531) + + -- Jean-Philippe Orsini Thu, 22 Dec 2011 21:11:44 -0500 + +psensor (0.6.2.15-1) unstable; urgency=low + + * New upstream release. + - fct sysinfo is replaced by gtop2 calls. (Closes: #650533) + * debian/control + - set priority to 'extra' instead of 'optional' due to dependence + on json-c lib which is using a priority 'extra'. + + -- Jean-Philippe Orsini Thu, 01 Dec 2011 01:57:00 +0100 + +psensor (0.6.2.14-1) unstable; urgency=low + + * New upstream release. + - monochrome icons for Ubuntu themes. (Closes LP: #811003) + * debian/copyright: + - replaced email with my personnal one + - added license and copyright info for jqplot + * debian/control: + - removed useless dep to lua + - switch to Standards-Version 3.9.2 + - added build dep to libjs-query + - replaced email with my personnal one + - build dep to gtk3 instead of gtk2 + * debian/psensor.install: + - added icons directory to include ubuntu default icons theme + - added directories for glade files + - added directory for autostart file + * debian/psensor-server.links: + - linked query.js file from libjs-query package + + -- Jean-Philippe Orsini Fri, 25 Nov 2011 02:56:22 -0500 + +psensor (0.6.1.9-3) unstable; urgency=low + + * debian/copyright: + - Fixed Lintian error: helper-templates-in-copyright + + -- Jean-Philippe Orsini Mon, 12 Sep 2011 05:47:02 -0400 + +psensor (0.6.1.9-2) unstable; urgency=low + + * debian/psensor-server.install: + - Fixed missing www files. + + -- Jean-Philippe Orsini Fri, 20 May 2011 02:52:34 -0400 + +psensor (0.6.1.9-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Fixed Lintian warning: newer-standards-version. + + -- Jean-Philippe Orsini Tue, 03 May 2011 11:26:03 +0200 + +psensor (0.6.1.8-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - removed empty paragraphs. (Closes: #624236) + - added build-dep to autoconf,automake,gettext,autopoint + - switched to Standards-Version 3.9.2 + + -- Jean-Philippe Orsini Thu, 21 Apr 2011 15:19:35 +0200 + +psensor (0.6.1.7-1) unstable; urgency=low + + * New upstream release. + + -- Jean-Philippe Orsini Tue, 19 Apr 2011 14:43:17 +0200 + +psensor (0.6.1.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: fixed capitalization-error-in-description + + -- Jean-Philippe Orsini Thu, 14 Apr 2011 23:57:35 +0200 + +psensor (0.6.1.5-1) unstable; urgency=low + + * Initial release. + + -- Jean-Philippe Orsini Sun, 20 Feb 2011 15:15:30 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3471ed9 --- /dev/null +++ b/debian/control @@ -0,0 +1,84 @@ +Source: psensor +Section: utils +Priority: extra +Maintainer: Jean-Philippe Orsini +Build-Depends: asciidoc, + autoconf, + automake, + autopoint, + dh-autoreconf, + cppcheck, + debhelper (>= 9), + gettext, + help2man, + libappindicator3-dev, + libatasmart-dev [!hurd-any !kfreebsd-any], + libcurl4-gnutls-dev, + libgconf2-dev, + libgtk-3-dev, + libgtop2-dev, + libjson-c-dev, + libmicrohttpd-dev, + libnotify-dev, + libsensors4-dev, + libunity-dev, + nvidia-settings [i386 amd64], + perl +Standards-Version: 3.9.5 +Vcs-Browser: http://wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git +Vcs-Git: git://git.wpitchoune.net/psensor-pkg-ubuntu.git +Homepage: http://wpitchoune.net/psensor + +Package: psensor +Architecture: any +Depends: psensor-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: hddtemp +Description: display graphs for monitoring hardware temperature + Psensor is a GTK+ application for monitoring hardware sensors, + including temperatures and fan speeds. + . + It displays a curve for each sensor, alerts user using Desktop Notification + and Application Indicator when a temperature is too high. + . + It can monitor: + * the temperature of the motherboard and CPU sensors (using lm-sensors). + * the temperature of the NVidia GPUs (using XNVCtrl). + * the temperature of the Hard Disk Drives (using hddtemp or atasmart lib). + * the rotation speed of the fans (using lm-sensors). + * the sensors of a remote computer (using psensor-server). + . + +Package: psensor-server +Architecture: any +Depends: libjs-jquery, + psensor-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: hddtemp +Description: Psensor server for monitoring hardware sensors remotely + Psensor server is an HTTP server providing a JSON Web service which can be + used by Psensor GTK+ Application to monitor remotely the hardware sensors + of a computer. + . + It can provide information about: + * the temperature of the motherboard and CPU sensors (using lm-sensors). + * the temperature of the NVidia GPUs (using XNVCtrl). + * the temperature of the Hard Disk Drives (using hddtemp). + * the rotation speed of the fans (using lm-sensors). + . + It is also possible to connect to Psensor server with a browser, a simple + Web page is displaying the information. + . + +Package: psensor-common +Architecture: all +Depends: ${misc:Depends} +Description: common files for Psensor and Psensor server + It contains: + * the languages packs, + * the README, + * and the FAQ. + This package is required by psensor and psensor-server packages. + . diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..d0808ba --- /dev/null +++ b/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Jean-Philippe Orsini +Tue, 15 Feb 18:33:41 CET 2011. + +It was downloaded from: http://wpitchoune.net/psensor + +Upstream Author: Jean-Philippe Orsini + +Copyright: + Copyright (C) 2010-2014 by Jean-Philippe Orsini + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian/Ubuntu systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL-2'. + +Packaging: + Copyright (C) 2010-2014 by Jean-Philippe Orsini + released under GNU General Public License version 2. + + +The following files are distributed under their own terms: + +www/{jqplot.css,jqplot.dateAxisRenderer.js,jqplot.js}: + Copyright (c) 2009-2013 Chris Leonello + Dual licensed under the MIT and GNU General Public License version 2 diff --git a/debian/psensor-common.doc-base.manual b/debian/psensor-common.doc-base.manual new file mode 100644 index 0000000..3d60e5b --- /dev/null +++ b/debian/psensor-common.doc-base.manual @@ -0,0 +1,9 @@ +Document: psensor +Title: Psensor Manual +Author: Jean-Philippe Orsini +Abstract: This manual describes what psensor is and how it can be used +Section: System/Monitoring + +Format: HTML +Index: /usr/share/doc/psensor/README.html +Files: /usr/share/doc/psensor/README.html diff --git a/debian/psensor-common.install b/debian/psensor-common.install new file mode 100644 index 0000000..c74cc82 --- /dev/null +++ b/debian/psensor-common.install @@ -0,0 +1,5 @@ +/usr/share/locale +/usr/share/doc/psensor/faq.txt +/usr/share/doc/psensor/faq.html +/usr/share/doc/psensor/README +/usr/share/doc/psensor/README.html diff --git a/debian/psensor-common.lintian-overrides b/debian/psensor-common.lintian-overrides new file mode 100644 index 0000000..0981191 --- /dev/null +++ b/debian/psensor-common.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream does not provide changelog +psensor-common: no-upstream-changelog diff --git a/debian/psensor-server.install b/debian/psensor-server.install new file mode 100644 index 0000000..6b94ea8 --- /dev/null +++ b/debian/psensor-server.install @@ -0,0 +1,2 @@ +/usr/bin/psensor-server +/usr/share/psensor/www diff --git a/debian/psensor-server.links b/debian/psensor-server.links new file mode 100644 index 0000000..7785f45 --- /dev/null +++ b/debian/psensor-server.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/psensor/www/jquery.js \ No newline at end of file diff --git a/debian/psensor-server.lintian-overrides b/debian/psensor-server.lintian-overrides new file mode 100644 index 0000000..e7fabeb --- /dev/null +++ b/debian/psensor-server.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream does not provide changelog +psensor-server: no-upstream-changelog diff --git a/debian/psensor-server.manpages b/debian/psensor-server.manpages new file mode 100644 index 0000000..4d121e6 --- /dev/null +++ b/debian/psensor-server.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/psensor-server.1 \ No newline at end of file diff --git a/debian/psensor.install b/debian/psensor.install new file mode 100644 index 0000000..c39a414 --- /dev/null +++ b/debian/psensor.install @@ -0,0 +1,7 @@ +/etc/gconf/schemas/psensor.schemas +/usr/bin/psensor +/usr/share/applications +/usr/share/icons +/usr/share/psensor/psensor-pref.glade +/usr/share/psensor/sensor-edit.glade +/usr/share/psensor/psensor.glade diff --git a/debian/psensor.lintian-overrides b/debian/psensor.lintian-overrides new file mode 100644 index 0000000..1e95f7f --- /dev/null +++ b/debian/psensor.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream does not provide changelog +psensor: no-upstream-changelog diff --git a/debian/psensor.manpages b/debian/psensor.manpages new file mode 100644 index 0000000..336b6c0 --- /dev/null +++ b/debian/psensor.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/psensor.1 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..1a9bfb1 --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + +%: + dh $@ --with=autoreconf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..073b5ff --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz