Merge tag 'upstream/1.1.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
Upstream version 1.1.2

Conflicts:
configure

17 files changed:
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/psensor-common.doc-base.manual [new file with mode: 0644]
debian/psensor-common.install [new file with mode: 0644]
debian/psensor-common.lintian-overrides [new file with mode: 0644]
debian/psensor-server.install [new file with mode: 0644]
debian/psensor-server.links [new file with mode: 0644]
debian/psensor-server.lintian-overrides [new file with mode: 0644]
debian/psensor-server.manpages [new file with mode: 0644]
debian/psensor.install [new file with mode: 0644]
debian/psensor.lintian-overrides [new file with mode: 0644]
debian/psensor.manpages [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..bac1964
--- /dev/null
@@ -0,0 +1,253 @@
+psensor (1.1.1-1ppatrusty2) trusty; urgency=medium
+
+  * debian/psensor.install
+      + added gsettings schema.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 01 Sep 2014 19:50:19 +0200
+
+psensor (1.1.1-1ppatrusty1) trusty; urgency=medium
+
+  * New upstream release.
+  * debian/psensor.install
+      + removed gconf schema.
+  * debian/control
+      + removed build dep to gconf which is no more needed.
+      + added build dep to libudisks2-dev.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 01 Sep 2014 17:50:19 +0200
+
+psensor (1.0.4-1) unstable; 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)
+  * debian/control
+      + added build dep to libappindicator3-dev.
+      + switched to optional priority instead of extra.
+      + removed useless dots after long descriptions.
+  * debian/rules
+      + removed useless comments.
+  * debian/copyright
+      + switched to copyright format 1.0.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Wed, 06 Aug 2014 18:36:41 -0400
+
+psensor (1.0.2-1) unstable; 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 <jeanfi@gmail.com>  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 <wookey@debian.org>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  Thu, 21 Apr 2011 15:19:35 +0200
+
+psensor (0.6.1.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  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 <jeanfi@gmail.com>  Thu, 14 Apr 2011 23:57:35 +0200
+
+psensor (0.6.1.5-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Sun, 20 Feb 2011 15:15:30 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..3bcb984
--- /dev/null
@@ -0,0 +1,84 @@
+Source: psensor
+Section: utils
+Priority: optional
+Maintainer: Jean-Philippe Orsini <jeanfi@gmail.com>
+Build-Depends: asciidoc,
+               autoconf,
+               automake,
+               autopoint,
+               dh-autoreconf,
+               cppcheck,
+               debhelper (>= 9),
+               gettext,
+               help2man,
+               libappindicator3-dev,
+               libatasmart-dev [!hurd-any !kfreebsd-any],
+               libcurl4-gnutls-dev,
+               libgtk-3-dev,
+               libgtop2-dev,
+               libjson-c-dev,
+               libmicrohttpd-dev,
+               libnotify-dev,
+               libsensors4-dev,
+               libudisks2-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 (file)
index 0000000..b34d328
--- /dev/null
@@ -0,0 +1,57 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: psensor
+Upstream-Contact: Jean-Philippe Orsini <jeanfi@gmail.com>
+Source: http://wpitchoune.net/psensor
+
+Files: *
+Copyright: 2010-2014 Jean-Philippe Orsini <jeanfi@gmail.com>
+License: GPL-2.0
+
+Files: www/jqplot.css www/jqplot.dateAxisRenderer.js www/jqplot.js
+Copyright: 2009-2013 Chris Leonello <chris@jqplot.com>
+License: GPL-2.0 or MIT
+
+Files: www/jquery.js
+Copyright: 2005-2012 jQuery Foundation, Inc. and other contributors
+License: MIT
+
+Files: debian/*
+Copyright: 2010-2014 Jean-Philippe Orsini <jeanfi@gmail.com>
+License: GPL-2.0
+
+License: GPL-2.0
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: MIT
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/debian/psensor-common.doc-base.manual b/debian/psensor-common.doc-base.manual
new file mode 100644 (file)
index 0000000..3d60e5b
--- /dev/null
@@ -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 (file)
index 0000000..c74cc82
--- /dev/null
@@ -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 (file)
index 0000000..0981191
--- /dev/null
@@ -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 (file)
index 0000000..6b94ea8
--- /dev/null
@@ -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 (file)
index 0000000..7785f45
--- /dev/null
@@ -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 (file)
index 0000000..e7fabeb
--- /dev/null
@@ -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 (file)
index 0000000..4d121e6
--- /dev/null
@@ -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 (file)
index 0000000..463280b
--- /dev/null
@@ -0,0 +1,8 @@
+/usr/bin/psensor
+/usr/share/applications
+/usr/share/glib-2.0
+/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 (file)
index 0000000..1e95f7f
--- /dev/null
@@ -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 (file)
index 0000000..336b6c0
--- /dev/null
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/psensor.1
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..5b84297
--- /dev/null
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+
+%:
+       dh $@ --with=autoreconf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..073b5ff
--- /dev/null
@@ -0,0 +1,2 @@
+version=3
+http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz