From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sat, 20 Sep 2014 22:38:22 +0000 (+0200)
Subject: Merge branch 'ppa-daily-trunk'
X-Git-Tag: debian/1.1.3-1ppautopic1~7
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=75fa49ffb0c9c8b60328c13ec8613299d094a2e5

Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/psensor.install
---

75fa49ffb0c9c8b60328c13ec8613299d094a2e5
diff --cc debian/psensor.install
index 0163d01,716001e..463280b
--- a/debian/psensor.install
+++ b/debian/psensor.install
@@@ -1,7 -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/schemas/psensor.gschema.xml
 -/usr/share/glib-2.0
++