[Pkg-xfce-commits] r2277 - in goodies/xfce4-battery-plugin/debian: . patches

corsac at alioth.debian.org corsac at alioth.debian.org
Sun Sep 7 08:39:48 UTC 2008 

Author: corsac
Date: 2008-09-07 08:39:47 +0000 (Sun, 07 Sep 2008)
New Revision: 2277

Removed:
   goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch
   goodies/xfce4-battery-plugin/debian/patches/03_lower-acpi-polling.patch
   goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
   goodies/xfce4-battery-plugin/debian/patches/08_ja.po.patch
Modified:
   goodies/xfce4-battery-plugin/debian/changelog
Log:
* New upstream release.
* debian/patches:
  - 03_lower-acpi-polling removed, same thing is included upstream now.
  - 02_fix-2.6.21 same. 
  - 05_fix-apm-kfreebsd-amd6 as well. 
  - 08_ja.po too. 

Modified: goodies/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/xfce4-battery-plugin/debian/changelog	2008-08-24 15:42:59 UTC (rev 2276)
+++ goodies/xfce4-battery-plugin/debian/changelog	2008-09-07 08:39:47 UTC (rev 2277)
@@ -1,3 +1,14 @@
+xfce4-battery-plugin (0.5.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 03_lower-acpi-polling removed, same thing is included upstream now.
+    - 02_fix-2.6.21 same. 
+    - 05_fix-apm-kfreebsd-amd6 as well. 
+    - 08_ja.po too. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Sep 2008 10:34:22 +0200
+
 xfce4-battery-plugin (0.5.0-7) unstable; urgency=low
 
   * debian/patches:

Deleted: goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch	2008-08-24 15:42:59 UTC (rev 2276)
+++ goodies/xfce4-battery-plugin/debian/patches/02_fix-2.6.21.patch	2008-09-07 08:39:47 UTC (rev 2277)
@@ -1,16 +0,0 @@
-diff -Nru xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c
---- xfce4-battery-plugin-0.5.0-old/panel-plugin/libacpi.c	2007-04-29 15:08:23.670477251 +0000
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c	2007-04-29 15:17:23.213224040 +0000
-@@ -207,10 +207,10 @@
- #ifdef __linux__
-   FILE *acpi;
- 
--  if (!(acpi = fopen ("/proc/acpi/info", "r")))
-+  if ( (!(acpi = fopen ("/proc/acpi/info", "r"))) && (!(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r"))) )
-   {
- #ifdef DEBUG
--	  printf("DBG:no acpi: /proc/acpi/info not found!\n");
-+	  printf("DBG:no acpi: /proc/acpi/info and /sys/module/acpi/parameters/acpica_version not found!\n");
- #endif
-     return 1;
-   }

Deleted: goodies/xfce4-battery-plugin/debian/patches/03_lower-acpi-polling.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/03_lower-acpi-polling.patch	2008-08-24 15:42:59 UTC (rev 2276)
+++ goodies/xfce4-battery-plugin/debian/patches/03_lower-acpi-polling.patch	2008-09-07 08:39:47 UTC (rev 2277)
@@ -1,39 +0,0 @@
-Index: panel-plugin/battery.c
-===================================================================
---- panel-plugin/battery.c	(revision 3481)
-+++ panel-plugin/battery.c	(working copy)
-@@ -326,14 +326,14 @@
-         }
-             else
- #endif
--            battmon->timeoutid = g_timeout_add(2 * 1024,
-+            battmon->timeoutid = g_timeout_add(10 * 1024,
-                     (GSourceFunc) update_apm_status, battmon);
-     }
- 
-     /* Show initial state if using ACPI rather than waiting a minute */
-     if(battmon->flag) {
-         g_source_remove(battmon->timeoutid);
--        battmon->timeoutid = g_timeout_add(2 * 1024,
-+        battmon->timeoutid = g_timeout_add(10 * 1024,
-                 (GSourceFunc) update_apm_status, battmon);
-     }
- 
-@@ -739,7 +739,7 @@
-     gtk_container_remove(GTK_CONTAINER(battmon->ebox), GTK_WIDGET(battmon->vbox));
-     setup_battmon(battmon,orientation);
-     update_apm_status( battmon );
--    battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon);
-+    battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon);
- 
-     return TRUE;
- }
-@@ -1405,7 +1405,7 @@
-     if(battmon->method == BM_USE_ACPI) {
-         battmon->flag = TRUE;
-         g_source_remove(battmon->timeoutid);
--        battmon->timeoutid = g_timeout_add(1000, (GSourceFunc) update_apm_status, battmon);
-+        battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon);
-     }
- }
- 

Deleted: goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	2008-08-24 15:42:59 UTC (rev 2276)
+++ goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	2008-09-07 08:39:47 UTC (rev 2277)
@@ -1,33 +0,0 @@
-Index: xfce4-battery-plugin-0.5.0/panel-plugin/battery.c
-===================================================================
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/battery.c	2008-01-24 19:34:30.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/battery.c	2008-01-24 19:34:34.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <config.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
- #include <machine/apm_bios.h>
- #elif __OpenBSD__
- #include <sys/param.h>
-@@ -163,7 +163,9 @@
-      except that is does not work on FreeBSD
- 
-   */
-+#ifdef __linux__ || APMDEVICE
-     struct apm_info apm;
-+#endif
-       int fd;
- 
-     /* First check to see if ACPI is available */
-@@ -310,7 +312,9 @@
-       acline = apm.ac_state ? TRUE : FALSE;
- 
- #else
-+#ifdef __linux__ || APMDEVICE
-     struct apm_info apm;
-+#endif
-     DBG ("Updating battery status...");
- 
-     if(battmon->method == BM_BROKEN) {

Deleted: goodies/xfce4-battery-plugin/debian/patches/08_ja.po.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/08_ja.po.patch	2008-08-24 15:42:59 UTC (rev 2276)
+++ goodies/xfce4-battery-plugin/debian/patches/08_ja.po.patch	2008-09-07 08:39:47 UTC (rev 2277)
@@ -1,201 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7257a56..29b6567 100644
---- a/configure.in
-+++ b/configure.in
-@@ -55,7 +55,7 @@ AC_CHECK_FUNCS([sysctl])
- dnl ******************************
- dnl *** Check for i18n support ***
- dnl ******************************
--XDT_I18N([ca cs eu fr pl])
-+XDT_I18N([ca cs eu fr ja pl])
- 
- dnl ***********************************
- dnl *** Check for required packages ***
-@@ -89,4 +89,4 @@ echo
- echo "Build Configuration:"
- echo
- echo "* Debug Support:    $enable_debug"
--echo
-\ No newline at end of file
-+echo
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 79d0a93..c1adf0d 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1,2 +1,2 @@
- # set of available languages (in alphabetic order)
--ca cs eu fr pl
-+ca cs eu fr ja pl
-diff --git a/po/ja.po b/po/ja.po
-new file mode 100644
-index 0000000..864a786
---- /dev/null
-+++ b/po/ja.po
-@@ -0,0 +1,167 @@
-+# Japanese translations for xfce4-battery-plugin package.
-+# Copyright (C) Eduard Roccatello <eduard at xfce.org>
-+# 		Eduard Roccatello <eduard at xfce.org
-+# 		Nick Penwarden <toth64 at yahoo.com>
-+# 		Benedikt Meurer <benny at xfce.org>
-+# 		Edscott Wilson Garcia <edscott at users.sourceforge.net>
-+# 		Rickard E. Faith <faith at acm.org>
-+# 		Noberasco Michele <2001s098 at educ.disi.unige.it>
-+# 		Nick Schermer <nick at xfce.org>
-+# This file is distributed under the same license as the xfce4-battery-plugin package.
-+# Nobuhiro Iwamatsu <iwamatsu at nigauri.org>, 2007,2008.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: xfce4-battery-plugin 0.4.0\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2006-12-20 17:45+0100\n"
-+"PO-Revision-Date: 2008-04-07 04:52+0900\n"
-+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
-+"Language-Team: Japanese <xfce-i18n at xfce.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: ../panel-plugin/battery.c:491
-+msgid "(Charging from AC)"
-+msgstr "(AC から充電中)"
-+
-+#: ../panel-plugin/battery.c:491
-+msgid "(AC on-line)"
-+msgstr "AC 接続"
-+
-+#: ../panel-plugin/battery.c:500
-+#, c-format
-+msgid "%d%% (%02d:%02d) remaining"
-+msgstr "残り %d%% (%02d:%02d)"
-+
-+#: ../panel-plugin/battery.c:502
-+#, c-format
-+msgid "%02d:%02d remaining"
-+msgstr "残り %02d:%02d"
-+
-+#: ../panel-plugin/battery.c:504
-+#, c-format
-+msgid "%d%% remaining"
-+msgstr "残り %d%%"
-+
-+#: ../panel-plugin/battery.c:506
-+msgid "AC off-line"
-+msgstr "AC 未接続"
-+
-+#: ../panel-plugin/battery.c:570
-+msgid ""
-+"WARNING: Your battery has reached critical status. You should plug in or "
-+"shutdown your computer now to avoid possible data loss."
-+msgstr ""
-+"警告: バッテリーが空に近い状態になりました。電源プラグを差し込むか、"
-+"できるたけデータが消えないように、コンピューターをシャットダウンすべきです。"
-+
-+#: ../panel-plugin/battery.c:584
-+msgid ""
-+"WARNING: Your battery is running low. You should consider plugging in or "
-+"shutting down your computer soon to avoid possible data loss."
-+msgstr ""
-+"警告: バッテリーが残り少ない状態になりました。電源プラグを差し込む事を考えるか、"
-+"データが消えないように、すぐにコンピューターをシャットダウンすべきです。"
-+
-+#: ../panel-plugin/battery.c:673
-+msgid "Battery"
-+msgstr "バッテリー"
-+
-+#: ../panel-plugin/battery.c:1099
-+msgid "Select file"
-+msgstr "ファイル選択"
-+
-+#: ../panel-plugin/battery.c:1140
-+msgid "Select command"
-+msgstr "コマンド選択"
-+
-+#: ../panel-plugin/battery.c:1159
-+#, c-format
-+msgid "Unable to open the following url: %s"
-+msgstr "以下のurlを開くことができません: %s"
-+
-+#: ../panel-plugin/battery.c:1183
-+#: ../panel-plugin/battmon.desktop.in.in.h:1
-+msgid "Battery Monitor"
-+msgstr "バッテリーモニタ"
-+
-+#: ../panel-plugin/battery.c:1212
-+msgid "Low percentage:"
-+msgstr "低残量:"
-+
-+#: ../panel-plugin/battery.c:1223
-+msgid "Critical percentage:"
-+msgstr "空に近い時の残量:"
-+
-+#: ../panel-plugin/battery.c:1236
-+msgid "Low battery action:"
-+msgstr "バッテリーが少ない時のアクション:"
-+
-+#: ../panel-plugin/battery.c:1242
-+#: ../panel-plugin/battery.c:1283
-+msgid "Do nothing"
-+msgstr "なにもしない"
-+
-+#: ../panel-plugin/battery.c:1244
-+#: ../panel-plugin/battery.c:1285
-+msgid "Display a warning message"
-+msgstr "警告メッセージを表示する"
-+
-+#: ../panel-plugin/battery.c:1246
-+#: ../panel-plugin/battery.c:1287
-+msgid "Run command"
-+msgstr "コマンドを実行する"
-+
-+#: ../panel-plugin/battery.c:1248
-+#: ../panel-plugin/battery.c:1289
-+msgid "Run command in terminal:"
-+msgstr "ターミナルでコマンドを実行する:"
-+
-+#: ../panel-plugin/battery.c:1261
-+#: ../panel-plugin/battery.c:1301
-+msgid "Command:"
-+msgstr "コマンド:"
-+
-+#: ../panel-plugin/battery.c:1277
-+msgid "Critical battery action:"
-+msgstr "バッテリーが空に近い時のアクション:"
-+
-+#: ../panel-plugin/battery.c:1324
-+msgid "Display label"
-+msgstr "ラベルを表示する"
-+
-+#: ../panel-plugin/battery.c:1327
-+msgid "Display percentage"
-+msgstr "残量を表示する"
-+
-+#: ../panel-plugin/battery.c:1330
-+msgid "Display time"
-+msgstr "時間を表示する"
-+
-+#: ../panel-plugin/battery.c:1333
-+msgid "Hide time/percentage when full"
-+msgstr "バッテリーが満充電時、時間と残量を隠す"
-+
-+#: ../panel-plugin/battery.c:1336
-+msgid "Display percentage in tooltip"
-+msgstr "残量をツールチップに表示する"
-+
-+#: ../panel-plugin/battery.c:1339
-+msgid "Display time remaining in tooltip"
-+msgstr "残り時間をツールチップに表示する"
-+
-+#: ../panel-plugin/battery.c:1342
-+msgid "Display power"
-+msgstr "パワーを表示する"
-+
-+#: ../panel-plugin/battery.c:1345
-+msgid "Display icon"
-+msgstr "アイコン表示する"
-+
-+#: ../panel-plugin/battmon.desktop.in.in.h:2
-+msgid "Show and monitor the battery status"
-+msgstr "バッテリー状況の表示と監視する"
-+

More information about the Pkg-xfce-commits mailing list