merged history

diff --git a/debian/changelog b/debian/changelog
index 1eb4be5..69de09a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,4 @@
-psensor (1.0.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
-
-  * 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.6-1) unstable; urgency=low
+psensor (0.8.0.6-1) trusty; urgency=low
 
   * New upstream release.
       + fixed AppIndicator icons. (LP: #1290072)
@@ -26,6 +12,8 @@ psensor (0.8.0.6-1) unstable; urgency=low
       + psensor/packaging copyright end date set to 2014.
       + jqplot (updated upstream) copyright end date set to 2013.
       + excanvas.js (removed upstream) copyright removed.
+  * debian/psensor.install
+      + don't autostart psensor by default.
 
  -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 15 Apr 2014 03:40:40 -0400