Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/changelog

diff --combined debian/changelog
index bac1964,362d523..c0f2ee0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,28 +1,22 @@@
- psensor (1.1.1-1ppatrusty2) trusty; urgency=medium
 -psensor (1.1.2-1ppatrusty1) trusty; urgency=medium
--
-   * debian/psensor.install
-       + added gsettings schema.
 -  * New upstream release.
--
-  -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 01 Sep 2014 19:50:19 +0200
 - -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 01 Sep 2014 17: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 --combined debian/psensor.install
index 463280b,716001e..4a71b01
--- 1/debian/psensor.install
--- 2/debian/psensor.install
+++ b/debian/psensor.install
@@@ -1,8 -1,7 +1,7 @@@
  /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
- 
 -/usr/share/glib-2.0