Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog

diff --combined debian/changelog
index a4801da,00060b2..cdd4a25
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,29 +1,35 @@@
- psensor (0.8.0.5-1ppasaucy1) saucy; urgency=low
 +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.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
  
- psensor (0.8.0.4-1) saucy; urgency=low
+ psensor (0.8.0.6-1) unstable; urgency=low
+ 
+   * New upstream release.
+       + fixed AppIndicator icons. (LP: #1290072)
+       + removed webfont to fix lintian warning privacy-breach-generic.
+       + fixed lintian warning source-is-missing due to minimized .js.
+   * debian/control
+       + switched to Standards-Version 3.9.5.
+       + fixed indentation of build-depends section.
+       + changed vcs headers, packaging maintained in git now.
+   * debian/copyright
+       + psensor/packaging copyright end date set to 2014.
+       + jqplot (updated upstream) copyright end date set to 2013.
+       + excanvas.js (removed upstream) copyright removed.
+ 
+  -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 15 Apr 2014 03:40:40 -0400
+ 
+ psensor (0.8.0.4-1) unstable; urgency=low
  
    * New upstream release.
    * debian/control
@@@ -29,10 -42,7 +48,7 @@@
    * debian/psensor-common.doc-base.manual
        + registered to doc-base.
    * debian/rules
-       + regenerate config.{guess,sub} automaticaly. (Closes: #727950)
-   * Merge from Debian unstable, remaining Ubuntu changes:
-    - Build depend on nvidia-settings build-dep on i386 and amd64.
-    - Build depend on libunity-dev and libappindicator3-dev for Unity support.
+       + regenerate config.{guess,sub} automatically. (Closes: #727950)
  
   -- Jean-Philippe Orsini <jeanfi@gmail.com>  Fri, 20 Sep 2013 19:39:45 -0400