Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index bac1964..c0f2ee0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,22 @@
-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
+psensor (1.1.2-1) unstable; urgency=medium
 
   * New upstream release.
-  * debian/psensor.install
-      + removed gconf schema.
   * debian/control
+      + added dep to libxnvctrl-dev or nvidia-settings to enable
+        nvidia support and ease ubuntu sync.
       + removed build dep to gconf which is no more needed.
       + added build dep to libudisks2-dev.
+      + removed hddtemp from "Recommends" field (psensor is using
+       udisks2 by default now but not psensor-server).
+  * debian/psensor.install
+      + removed gconf schema.
+  * debian/copyright
+      + added copyright information about checkpatch.pl.
+  * debian/watch
+      + added location of the release signature.
+  * added debian/upstream/signing-key.asc
 
- -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 01 Sep 2014 17:50:19 +0200
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Sun, 21 Sep 2014 17:26:09 -0400
 
 psensor (1.0.4-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 3bcb984..085a5e3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: asciidoc,
                libsensors4-dev,
                libudisks2-dev,
                libunity-dev,
-               nvidia-settings [i386 amd64],
+                  libxnvctrl-dev [i386 amd64] | nvidia-settings [i386 amd64],
                perl
 Standards-Version: 3.9.5
 Vcs-Browser: http://wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git
@@ -34,7 +34,6 @@ 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.
@@ -48,7 +47,6 @@ Description: display graphs for monitoring hardware temperature
   * 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
@@ -70,7 +68,6 @@ Description: Psensor server for monitoring hardware sensors remotely
  .
  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
@@ -81,4 +78,3 @@ Description: common files for Psensor and Psensor server
   * the README,
   * and the FAQ.
  This package is required by psensor and psensor-server packages.
- .

diff --git a/debian/copyright b/debian/copyright
index b34d328..5688249 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,6 +15,13 @@ Files: www/jquery.js
 Copyright: 2005-2012 jQuery Foundation, Inc. and other contributors
 License: MIT
 
+Files: tests/checkpatch.pl
+Copyright: 2001 Dave Jones
+           2005 Joel Schopp <jschopp@austin.ibm.com>
+           2007-2008 Andy Whitcroft <apw@uk.ibm.com>
+           2008-2010 Andy Whitcroft <apw@canonical.com>
+License: GPL-2.0
+
 Files: debian/*
 Copyright: 2010-2014 Jean-Philippe Orsini <jeanfi@gmail.com>
 License: GPL-2.0

diff --git a/debian/psensor.install b/debian/psensor.install
index 463280b..4a71b01 100644 (file)
--- a/debian/psensor.install
+++ b/debian/psensor.install
@@ -5,4 +5,3 @@
 /usr/share/psensor/psensor-pref.glade
 /usr/share/psensor/sensor-edit.glade
 /usr/share/psensor/psensor.glade
-

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644 (file)
index 0000000..f3e1704
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,38 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+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
++gEFsJuBNl9Nl7syNiY=
+=x/eL
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/debian/watch b/debian/watch
index 073b5ff..146d1dd 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
 http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz
+opts=pgpsigurlmangle=s/$/.asc/ http://wpitchoune.net/psensor/files/psensor-(\d.*)\.tar\.gz
\ No newline at end of file