X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=debian%2Fchangelog;h=331a28e0b2c0c86feb1677a766f19e1b8830524b;hp=b246baa24e50f3fbfa4a417bfa21c7a32f1a20cc;hb=refs%2Fheads%2Ftrusty;hpb=048babad890813edddc887c425a6c34b6260e287

diff --git a/debian/changelog b/debian/changelog
index b246baa..331a28e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+psensor (0.8.0.5-1ppatrusty1) trusty; urgency=low
+
+  * New upstream release.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Fri, 11 Apr 2014 08:54:21 +0200
+
 psensor (0.8.0.4-1) saucy; urgency=low
 
   * New upstream release.
@@ -334,7 +340,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 +435,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