X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=debian%2Fchangelog;h=fef965f0799c8a162bedd9dfb851002d5ba62149;hp=b246baa24e50f3fbfa4a417bfa21c7a32f1a20cc;hb=014628e2e93d4cad9f88753b3f97d8f2c1c20e78;hpb=0ac0b192bf755986b82b04e060370887a638e188

diff --git a/debian/changelog b/debian/changelog
index b246baa..fef965f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,27 @@
-psensor (0.8.0.4-1) saucy; urgency=low
+psensor (0.8.0.6-1ppatrusty1) trusty; urgency=low
+
+  * Bump trusty PPA
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Fri, 11 Apr 2014 08:54:21 +0200
+
+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
@@ -17,10 +40,7 @@ psensor (0.8.0.4-1) saucy; urgency=low
   * 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
 
@@ -334,7 +354,6 @@ psensor (0.6.1.5-1) unstable; urgency=low
   * Initial release.
 
  -- Jean-Philippe Orsini <jeanfi@gmail.com>  Sun, 20 Feb 2011 15:15:30 +0100
-<<<<<<< .working
 
 psensor (0.6.1.5-0ubuntu1) maverick; urgency=low
 
@@ -430,6 +449,3 @@ psensor (0.6.0.14-1) maverick; urgency=low
   * upgrade upstream
 
  -- jeanfi <jeanfi@gmail.com>  Sat, 12 Feb 2011 14:34:42 +0100
-
-=======
->>>>>>> .merge-right.r1461