Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/psensor.install

diff --git a/debian/changelog b/debian/changelog
index e398d95..bac1964 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.

diff --git a/debian/psensor.install b/debian/psensor.install
index 716001e..463280b 100644 (file)
--- a/debian/psensor.install
+++ b/debian/psensor.install
@@ -1,7 +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
-/usr/share/glib-2.0
+