From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Tue, 3 Jun 2014 10:21:23 +0000 (+0200)
Subject: Merge branch 'master' into ppa-daily-trunk
X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~6
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=76ef076dad33bd2e8e325b88f504415002a97e4e

Merge branch 'master' into ppa-daily-trunk

Conflicts:
	debian/changelog
---

76ef076dad33bd2e8e325b88f504415002a97e4e
diff --cc debian/changelog
index 69de09a,5edfef5..7ad776a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,13 +1,18 @@@
- psensor (0.8.0.6-1) trusty; urgency=low
++psensor (1.0.2.x-1) saucy; urgency=low
++   * New upstream release.
++
++ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 3 Jun 2014 11:54:21 +0200
++
+ psensor (1.0.2-1ppatrusty1) trusty; urgency=low
+ 
+   * Bump trusty PPA
+ 
+  -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 3 Jun 2014 08:54:21 +0200
+ 
+ psensor (1.0.2-1) unstable; urgency=low
  
    * New upstream release.
-       + fixed AppIndicator icons. (LP: #1290072)
+       + fixed AppIndicator icons. (LP: #1290072) (LP: #1310323)
        + removed webfont to fix lintian warning privacy-breach-generic.
        + fixed lintian warning source-is-missing due to minimized .js.
    * debian/control