merge with changes from v0.6.1.x

diff --git a/debian/changelog b/debian/changelog
index 4bca628..9253833 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,45 @@
-psensor (0.6.1.3-3) lucid; urgency=low
+psensor (0.6.1.8-1ubuntu1) natty; urgency=low
 
-  * bump lucid
+  * New upstream release 
 
- -- Jean-Philippe Orsini <jeanfi@gmail.com>  Wed, 16 Feb 2011 10:13:55 +0100
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Mon, 25 Apr 2011 19:01:02 +0200
 
-psensor (0.6.1.3-2) natty; urgency=low
+psensor (0.6.1.8-1) unstable; urgency=low
 
-  * bump natty
+  * New upstream release
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Thu, 21 Apr 2011 15:19:35 +0200
+
+psensor (0.6.1.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Tue, 19 Apr 2011 14:43:17 +0200
+
+psensor (0.6.1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: fixed capitalization-error-in-description
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Thu, 14 Apr 2011 23:57:35 +0200
+
+psensor (0.6.1.5-1) unstable; urgency=low
+
+  * First official Debian package.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Sun, 20 Feb 2011 15:15:30 +0100
+
+psensor (0.6.1.5-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Thu, 17 Feb 2011 02:15:50 +0100
+
+psensor (0.6.1.4-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
 
- -- Jean-Philippe Orsini <jeanfi@gmail.com>  Wed, 16 Feb 2011 10:13:08 +0100
+ -- Jean-Philippe Orsini <jeanfi@gmail.com>  Wed, 16 Feb 2011 19:17:18 +0100
 
 psensor (0.6.1.3-1) maverick; urgency=low
 

diff --git a/debian/control b/debian/control
index a670a4f..0cadfce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: psensor
 Section: utils
 Priority: optional
 Maintainer: Jean-Philippe Orsini <jeanfi@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~),libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,nvidia-settings,help2man,libcurl4-openssl-dev,libjson0-dev,liblua5.1-0-dev,libmicrohttpd-dev,libgtop2-dev,perl,libappindicator-dev
+Build-Depends: debhelper (>= 7.0.50~),libgtk2.0-dev,libgconf2-dev,libnotify-dev,libsensors4-dev,help2man,libcurl4-openssl-dev,libjson0-dev,liblua5.1-0-dev,libmicrohttpd-dev,libgtop2-dev,perl
 Standards-Version: 3.9.1
 Homepage: http://wpitchoune.net/psensor
 
@@ -10,8 +10,8 @@ Package: psensor
 Architecture: any
 Depends: psensor-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: hddtemp
-Description: Display graphs for monitoring hardware temperature.
- Psensor is a GTK application for monitoring hardware sensors,
+Description: display graphs for monitoring hardware temperature
+ Psensor is a GTK+ application for monitoring hardware sensors,
  including temperatures and fan speeds.
  .
  It displays a curve for each sensor, alerts user using Desktop Notification
@@ -29,10 +29,10 @@ Package: psensor-server
 Architecture: any
 Depends: psensor-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: hddtemp
-Description: Psensor server for monitoring hardware sensors remotely.
+Description: Psensor server for monitoring hardware sensors remotely
  .
  Psensor server is an HTTP server providing a JSON Web service which can be
- used by Psensor GTK Application to monitor remotely the hardware sensors
+ used by Psensor GTK+ Application to monitor remotely the hardware sensors
  of a computer.
  .
  It can provide information about:
@@ -48,7 +48,7 @@ Description: Psensor server for monitoring hardware sensors remotely.
 Package: psensor-common
 Architecture: all
 Depends: ${misc:Depends}
-Description: Common files for Psensor and Psensor server.
+Description: common files for Psensor and Psensor server
  . 
  It contains languages packs for both Psensor and Psensor server.
  .
\ No newline at end of file

diff --git a/debian/copyright b/debian/copyright
index 10013ad..7be00c5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Tue, 15 Feb 18:33:41 CET 2011.
 
 It was downloaded from: http://wpitchoune.net/psensor
 
-Upstream Author(s): Jean-Philippe Orsini <jeanfi@gmail.com>
+Upstream Author(s): Jean-Philippe Orsini <wpitchoune@gmail.com>
 
 Copyright:
-    Copyright (C) 2010-2011 by Jean-Philippe Orsini <jeanfi@gmail.com>
+    Copyright (C) 2010-2011 by Jean-Philippe Orsini <wpitchoune@gmail.com>
 
 License:
 

diff --git a/po/fr.po b/po/fr.po
index 97c3f78..16ae5a9 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-04-22 23:54+0200\n"
+"POT-Creation-Date: 2011-04-25 13:46+0200\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"
@@ -75,17 +75,17 @@ msgstr "Signaler les bugs à: %s\n"
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 
-#: src/main.c:327 src/server/server.c:376
+#: src/main.c:328 src/server/server.c:376
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 
-#: src/main.c:350
+#: src/main.c:351
 #, fuzzy, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
 
-#: src/main.c:361
+#: src/main.c:362
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/psensor.pot b/po/psensor.pot
index f31e836..94935cb 100644 (file)
--- a/po/psensor.pot
+++ b/po/psensor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-04-22 23:54+0200\n"
+"POT-Creation-Date: 2011-04-25 13:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,17 +64,17 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:327 src/server/server.c:376
+#: src/main.c:328 src/server/server.c:376
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:350
+#: src/main.c:351
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:362
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/tr.po b/po/tr.po
index 16b4fea..3ac5385 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-04-22 23:54+0200\n"
+"POT-Creation-Date: 2011-04-25 13:46+0200\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -65,17 +65,17 @@ msgstr "Hataları rapor et:%s\n"
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 
-#: src/main.c:327 src/server/server.c:376
+#: src/main.c:328 src/server/server.c:376
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: src/main.c:350
+#: src/main.c:351
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:362
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 930eb5d..579a31b 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2011-04-22 23:54+0200\n"
+"POT-Creation-Date: 2011-04-25 13:46+0200\n"
 "PO-Revision-Date: 2011-02-07 22:21+0100\n"
 "Last-Translator: 大宝 <linux.dabao@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -63,17 +63,17 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/main.c:327 src/server/server.c:376
+#: src/main.c:328 src/server/server.c:376
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/main.c:350
+#: src/main.c:351
 #, c-format
 msgid "ERROR: lmsensor init failure: %s\n"
 msgstr ""
 
-#: src/main.c:361
+#: src/main.c:362
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""