From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 25 Apr 2014 09:30:41 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~9
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=56d21c57185d4e7c12a9afa191aa3336e73562c7

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---

56d21c57185d4e7c12a9afa191aa3336e73562c7
diff --cc debian/changelog
index a4801da,00060b2..cdd4a25
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,14 @@@
 +psensor (0.8.0.x-1) saucy; urgency=low
 +
 +  * New upstream release.
 +
 +-- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 07 Apr 2014 08:41:44 +0200
 +
- psensor (0.8.0.5-1ppasaucy1) saucy; urgency=low
+ psensor (0.8.0.6-1ppatrusty1) trusty; urgency=low
  
-   * New upstream release.
+   * Bump trusty PPA
+   * debian/psensor.install
+       + don't autostart psensor by default.
  
   -- Jean-Philippe Orsini <jeanfi@gmail.com>  Fri, 11 Apr 2014 08:54:21 +0200