From: Jean-Philippe Orsini Date: Fri, 20 Sep 2013 23:39:45 +0000 (-0400) Subject: Imported Debian patch 0.8.0.4-1 X-Git-Tag: debian/0.8.0.4-1^0 X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=commitdiff_plain;h=ba85e3eadb75ad8bd62d9f46f5f13c33b42cb864 Imported Debian patch 0.8.0.4-1 --- ba85e3eadb75ad8bd62d9f46f5f13c33b42cb864 diff --cc debian/changelog index 653f9fa,0000000..6c696f1 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,205 -1,0 +1,187 @@@ ++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 ++ * 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 ++ * 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 ++ * 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 ++ * 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 ++ * 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 ++ * 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 ++ * 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 ++ * 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 + - * First official Debian package. ++ * 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 --cc debian/compat index 7f8f011,0000000..ec63514 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 7 ++9 diff --cc debian/control index bcf0c05,0000000..09275b4 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,71 -1,0 +1,81 @@@ +Source: psensor +Section: utils +Priority: extra +Maintainer: Jean-Philippe Orsini - Build-Depends: autoconf, ++Build-Depends: asciidoc, ++ autoconf, + automake, + autopoint, - debhelper (>= 7.0.50~), ++ autotools-dev, ++ cppcheck, ++ debhelper (>= 9), + gettext, + help2man, ++ libatasmart-dev [!hurd-any !kfreebsd-any], + libcurl4-gnutls-dev, + libgconf2-dev, + libgtk-3-dev, + libgtop2-dev, - libjson0-dev, ++ libjson-c-dev, + libmicrohttpd-dev, + libnotify-dev, + libsensors4-dev, + perl - Standards-Version: 3.9.3 ++Standards-Version: 3.9.4 ++Vcs-Browser: http://wpitchoune.net/svnpub/packages/debian/psensor/trunk ++Vcs-Svn: http://wpitchoune.net/svnpub/packages/debian/psensor/trunk +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). ++ * 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 languages packs for both 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 --cc debian/copyright index 57237f8,0000000..eadf39c mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,39 -1,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-2012 by Jean-Philippe Orsini ++ Copyright (C) 2010-2013 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-2012 by Jean-Philippe Orsini ++ Copyright (C) 2010-2013 by Jean-Philippe Orsini + released under GNU General Public License version 2. + + +The following files are distributed under their own terms: + +www/{excanvas.js,jqplot.css,jqplot.dateAxisRenderer.js,jqplot.js}: + Copyright (c) 2009-2011 Chris Leonello + Dual licensed under the MIT and GNU General Public License version 2 diff --cc debian/psensor-common.doc-base.manual index 0000000,0000000..3d60e5b new file mode 100644 --- /dev/null +++ b/debian/psensor-common.doc-base.manual @@@ -1,0 -1,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 --cc debian/psensor-common.install index 94125c7,0000000..c74cc82 mode 100644,000000..100644 --- a/debian/psensor-common.install +++ b/debian/psensor-common.install @@@ -1,1 -1,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 --cc debian/psensor-common.lintian-overrides index 0000000,0000000..0981191 new file mode 100644 --- /dev/null +++ b/debian/psensor-common.lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# Upstream does not provide changelog ++psensor-common: no-upstream-changelog diff --cc debian/psensor-server.lintian-overrides index 0000000,0000000..e7fabeb new file mode 100644 --- /dev/null +++ b/debian/psensor-server.lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# Upstream does not provide changelog ++psensor-server: no-upstream-changelog diff --cc debian/psensor.install index 3f4a63b,0000000..e3090ab mode 100644,000000..100644 --- a/debian/psensor.install +++ b/debian/psensor.install @@@ -1,6 -1,0 +1,8 @@@ +/etc/xdg/autostart ++/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 --cc debian/psensor.lintian-overrides index 0000000,0000000..1e95f7f new file mode 100644 --- /dev/null +++ b/debian/psensor.lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# Upstream does not provide changelog ++psensor: no-upstream-changelog diff --cc debian/psensor.manpages index 16e0814,0000000..336b6c0 mode 100644,000000..100644 --- a/debian/psensor.manpages +++ b/debian/psensor.manpages @@@ -1,2 -1,0 +1,1 @@@ +debian/tmp/usr/share/man/man1/psensor.1 - diff --cc debian/rules index b760bee,0000000..1006222 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,13 -1,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 $@ ++ dh $@ --with=autotools_dev diff --cc debian/watch index 8833e44,0000000..073b5ff mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,2 @@@ +version=3 - - http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz ++http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz