Updating branch refs/heads/master
to bb1cf8cbcc630f51bce482e57bfe02bf7018ac2a (commit)
from 80099a38ab041cb167a48c3228df26f2d6297a3f (commit)
commit bb1cf8cbcc630f51bce482e57bfe02bf7018ac2a
Author: Florian Rivoal <[email protected]>
Date: Sat Dec 25 14:19:21 2010 +0900
Clean up
AUTHORS | 1 +
Makefile.am | 2 -
autogen.sh | 27 +---
configure.in.in => configure.ac.in | 6 +-
icons/16x16/Makefile.am | 2 -
icons/22x22/Makefile.am | 2 -
icons/24x24/Makefile.am | 2 -
icons/32x32/Makefile.am | 2 -
icons/Makefile.am | 2 -
icons/scalable/Makefile.am | 2 -
panel-plugin/Makefile.am | 2 -
panel-plugin/battery.c | 4 +-
panel-plugin/libacpi.c | 4 +-
panel-plugin/libacpi.h | 4 +-
panel-plugin/libapm.c | 4 +-
panel-plugin/libapm.h | 4 +-
po/ChangeLog | 233 ------------------------------------
po/LINGUAS | 2 -
po/xfce4-battery-plugin.pot | 149 -----------------------
19 files changed, 15 insertions(+), 439 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index fa80a17..1055588 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,3 +5,4 @@ Edscott Wilson Garcia <[email protected]>
Rickard E. Faith <[email protected]>
Noberasco Michele <[email protected]>
Nick Schermer <[email protected]>
+Florian Rivoal <[email protected]>
diff --git a/Makefile.am b/Makefile.am
index fc01f02..b557a5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
panel-plugin \
icons \
diff --git a/autogen.sh b/autogen.sh
index 3308482..524cc63 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,32 +1,19 @@
#!/bin/sh
#
-# $Id$
+# Copyright (c) 2002-2010
+# The Xfce development team. All rights reserved.
#
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
your system, which are required to build this software.
- Please install the xfce4-dev-tools package first, it is available
- from http://www.xfce.org/.
+ Please install the xfce4-dev-tools package first, available from
+ http://xfce.org/~benny/projects/xfce4-dev-tools/.
EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
+xdt-autogen $@
diff --git a/configure.in.in b/configure.ac.in
similarity index 96%
rename from configure.in.in
rename to configure.ac.in
index 5f3ece2..9a40867 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -1,9 +1,8 @@
-dnl $Id$
-dnl
dnl xfce4-battery-plugin - Battery monitor for the Xfce4 panel
dnl
dnl 2003 Benedikt Meurer <[email protected]>
dnl 2006-2007 Nick Schermer <[email protected]>
+dnl 2010 Florian Rivoal <[email protected]>
dnl
dnl ***************************
@@ -13,7 +12,7 @@ m4_define([battery_version_major], [0])
m4_define([battery_version_minor], [5])
m4_define([battery_version_micro], [2])
m4_define([battery_version_build], [...@revision@])
-m4_define([battery_version_tag], [svn])
+m4_define([battery_version_tag], [git])
m4_define([battery_version],
[battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(),
[svn], [battery_version_tag()-battery_version_build()],
[battery_version_tag()])])
dnl ***************************
@@ -24,7 +23,6 @@ AC_COPYRIGHT([Copyright (c) 2006-2007
AC_INIT([xfce4-battery-plugin], [battery_version],
[http://bugzilla.xfce.org/], [xfce4-battery-plugin])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
-AC_REVISION([$Id$])
dnl ***************************
dnl *** Initialize automake ***
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index a887a85..cf8644a 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/16x16/devices
icons_DATA = \
battery.png
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 559bd21..6e9a2f4 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/22x22/devices
icons_DATA = \
battery.png
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 279566a..c0b5950 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/24x24/devices
icons_DATA = \
battery.png
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index 5e0107f..0da7690 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/32x32/devices
icons_DATA = \
battery.png
diff --git a/icons/Makefile.am b/icons/Makefile.am
index db58111..6f45eb0 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
16x16 \
22x22 \
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index d59e913..648f58b 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/scalable/devices
icons_DATA = \
battery.svg
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 511f499..135ee8e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-battery-plugin\" \
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index a14c92b..fab2529 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -1,6 +1,4 @@
-/* $Id$
- *
- * Copyright (c) 2003 Nicholas Penwarden <[email protected]>
+/* Copyright (c) 2003 Nicholas Penwarden <[email protected]>
* Copyright (c) 2003 Benedikt Meurer <[email protected]>
* Copyright (c) 2003 Edscott Wilson Garcia <[email protected]>
* Copyright (c) 2005 Eduard Roccatello <[email protected]>
diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
index 31bdeaf..19e7496 100644
--- a/panel-plugin/libacpi.c
+++ b/panel-plugin/libacpi.c
@@ -1,6 +1,4 @@
-/* $Id$
- *
- * Copyright (c) 2002 Costantino Pistagna <[email protected]>
+/* Copyright (c) 2002 Costantino Pistagna <[email protected]>
* Copyright (c) 2003 Noberasco Michele <[email protected]>
* Copyright (c) 2003 Edscott Wilson Garcia <[email protected]>
*
diff --git a/panel-plugin/libacpi.h b/panel-plugin/libacpi.h
index cc4fb6e..5e5540b 100644
--- a/panel-plugin/libacpi.h
+++ b/panel-plugin/libacpi.h
@@ -1,6 +1,4 @@
-/* $Id$
- *
- * Copyright (c) 2002 Costantino Pistagna <[email protected]>
+/* Copyright (c) 2002 Costantino Pistagna <[email protected]>
* Copyright (c) 2003 Noberasco Michele <[email protected]>
* Copyright (c) 2003 Edscott Wilson Garcia <[email protected]>
*
diff --git a/panel-plugin/libapm.c b/panel-plugin/libapm.c
index cde93ea..95fa170 100644
--- a/panel-plugin/libapm.c
+++ b/panel-plugin/libapm.c
@@ -1,6 +1,4 @@
-/* $Id$
- *
- * Copyright (c) 1996, 1997 Rickard E. Faith <[email protected]>
+/* Copyright (c) 1996, 1997 Rickard E. Faith <[email protected]>
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published
diff --git a/panel-plugin/libapm.h b/panel-plugin/libapm.h
index a7ac33b..b9b7054 100644
--- a/panel-plugin/libapm.h
+++ b/panel-plugin/libapm.h
@@ -1,6 +1,4 @@
-/* $Id$
- *
- * Copyright (c) 1996, 1997 Rickard E. Faith <[email protected]>
+/* Copyright (c) 1996, 1997 Rickard E. Faith <[email protected]>
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 9064135..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,233 +0,0 @@
-2009-08-08 Mike Massonnet <[email protected]>
-
- * kk.po: Kazakh translation added (Baurzhan Muftakhidinov)
- * ast.po: Asturian translation added (Marcos Alvarez Costales)
-
-2009-07-23 Gabor Kelemen <[email protected]>
-
- * hu.po: Translation reworked.
-
-2009-06-28 Mike Massonnet <[email protected]>
-
- * vi.po: Vietnamese translation update (Vincent Nguyen)
-
-2009-05-29 Mike Massonnet <[email protected]>
-
- * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
- * ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-04-20 Mike Massonnet <[email protected]>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-16 Mike Massonnet <[email protected]>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-14 Maximilian Schleiss <[email protected]>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-05 Mike Massonnet <[email protected]>
-
- * pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-03-05 Mike Massonnet <[email protected]>
-
- * nb.po: Renamed nb_NO.po to nb.po (bug #4574)
-
-2009-02-22 Mike Massonnet <[email protected]>
-
- * es.po: Add Spanish translation (Abel Martín)
-
-2009-02-20 Maximilian Schleiss <[email protected]>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-02-19 Per Kongstad <[email protected]>
-
- * da.po: Danish translation updated (Per Kongstad)
-
-2009-02-07 Maximilian Schleiss <[email protected]>
-
- * pl.po: Polish translation update (Piotr Sokół)
-
-2009-02-07 Alexander Toresson <[email protected]>
-
- * sv.po: Swedish translation update (Daniel Nylander)
-
-2009-01-13 Alexander Toresson <[email protected]>
-
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-12-25 Maximilian Schleiss <[email protected]>
-
- * gl.po: Galician translation update (Leandro Regueiro)
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2008-12-13 Maximilian Schleiss <[email protected]>
-
- * zh_CN.po: Simplified Chinese translation added (Hunt Xu)
-
-2008-11-17 Eren Türkay <[email protected]>
-
- * tr.po: Turkish translation update (Turkish translation team)
-
-2008-11-12 Piarres Beobide <[email protected]>
-
- * eu.po: Basque translation update
-
-2008-11-09 Maximilian Schleiss <[email protected]>
-
- * sq.po: Albanian translation update (Besnik Bleta)
-
-2008-10-18 Maximilian Schleiss <[email protected]>
-
- * ja.po, LINGUAS: Japanese translation added (Nobuhiro Iwamatsu)
-
-2008-07-15 Mohamed Magdy <[email protected]>
-
- * ar.po: Add Arabic translation
-
-2008-06-26 Maximilian Schleiss <[email protected]>
-
- * gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
-
-2008-06-24 Jari Rahkonen <[email protected]>
-
- * fi.po, LINGUAS: Add Finnish translation (modified) from
- Launchpad
-
-2008-06-22 Mike Massonnet <[email protected]>
-
- * id.po, LINGUAS: Add Indonesian translation (Andhika Padmawan)
-
-2008-05-27 Mike Massonnet <[email protected]>
-
- * da.po, LINGUAS: Add Danish translation (Jannich Brendle)
-
-2008-03-30 Stavros Giannouris <[email protected]>
-
- * el.po, LINGUAS: Added Greek translation by Evaggelos Balaskas
- <[email protected]>
-
-2007-12-07 Maximilian Schleiss <[email protected]>
-
- * de.po: German translation added
- by Fabian Nowak <[email protected]>
-
-2007-11-18 Maximilian Schleiss <[email protected]>
-
- * lv.po: Latvian translation added
- by Rihards Priedītis <[email protected]>
-
-2007-11-15 Mike Massonnet <[email protected]>
-
- * ur.po: Update translation by Muhammad Ali Makki <[email protected]>
- * pk.po, ur.po: Rename pk.po to ur.po.
-
-2007-10-28 Mike Massonnet <[email protected]>
-
- * pk.po: Add new translation by محمد علي المكي <[email protected]>
-
-2007-09-03 Og Maciel <[email protected]>
-
- * pt_BR.po: Brazilian Portuguese translation added
- by Fábio Nogueira <[email protected]>
-
-2007-07-08 Maximilian Schleiss <[email protected]>
-
- * nb_NO.po: Norwegian Bokmal translation added
- by Terje Uriansrud <[email protected]>
- * pt_PT.po: European Protuguese translation added
- by Nuno Miguel <[email protected]>
-
-2007-06-13 Maximilian Schleiss <[email protected]>
-
- * it.po: Updated the translation
- by Roberto Pariset <[email protected]>
- * *.po: Fixed headers
-
-2007-05-11 Maximilian Schleiss <[email protected]>
-
- * ca.po: Updated the Catalan translation
- by Carles Muñoz Forriz <[email protected]>
-
-2007-03-31 Pau Rul-lan Ferragut <[email protected]>
-
- * gb.po: British translation by Jeff Bailes <[email protected]>
-
-2007-03-17 Hydonsingore Cia <[email protected]>
-
- * zh_TW.po: Added traditional Chinese translation
- by Dsewnr Lu <[email protected]>.
-
-2007-03-02 Maximilian Schleiss <[email protected]>
-
- * uk.po: Added the Ukrainian translation by
- Dmitry Nikitin <[email protected]>
- * Modified LINGUAS (thx Dmitry)
-
-2007-02-20 Maximilian Schleiss <[email protected]>
-
- * sq.po: Modified the headers for the Albanian translation by
- Besnik Bleta <[email protected]>
-
-2007-02-02 Maximilian Schleiss <[email protected]>
-
- * fr.po: Added the Albanian translation by
- Besnik Bleta <[email protected]>
-
-2007-01-18 Maximilian Schleiss <[email protected]>
-
- * pl.po: Updated the Polish translation by
- Szymon Kałasz <[email protected]>
-
-2007-01-03 Piarres Beobide <[email protected]>
-
- * eu.po: Updated basque translation
-2006-12-22 Maximilian Schleiss <[email protected]>
-
- * fr.po: Updated the French translation
-
-2006-12-21 Maximilian Schleiss <[email protected]>
-
- * cs.po: Updated the Czech translation by
- Michal Várady <[email protected]>.
-
-2006-12-15 Pau Rul-lan Ferragut <[email protected]>
-
- * ca.po: Added Catalan translation
- by Carles Muñoz Gorriz <[email protected]>
-
-2006-11-11 Maximilian Schleiss <[email protected]>
-
- * cs.po: Updated the Czech translation
- by Michal Várady <[email protected]>.
-
-2006-10-26 Maximilian Schleiss <[email protected]>
-
- * fr.po: Updated French translation.
-
-2006-10-25 Piarres Beobide
-
- * LINGUAS, eu.po Add basque translation
-
-2006-09-23 Jean-François Wauthy <[email protected]>
-
- * cs.po: Updated Czech translations by Michal Varady
- <[email protected]>
-
-2006-09-17 Jean-François Wauthy <[email protected]>
-
- * fr.po: Add French translations
- * pl.po: Updated Polish translations
-
-2006-09-03 Jean-François Wauthy <[email protected]>
-
- * pl.po: Add Polish translations
-
-2006-08-27 Jean-François Wauthy <[email protected]>
-
- * cs.po: Add Czech translations
-
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 1f19255..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de el en_GB es eu fi fr gl id it ja kk lv nb pl pt_BR pt sq sv
tr uk ur ur_PK vi zh_CN zh_TW
diff --git a/po/xfce4-battery-plugin.pot b/po/xfce4-battery-plugin.pot
deleted file mode 100644
index b0fb2e9..0000000
--- a/po/xfce4-battery-plugin.pot
+++ /dev/null
@@ -1,149 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-20 17:45+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/battery.c:491
-msgid "(Charging from AC)"
-msgstr ""
-
-#: ../panel-plugin/battery.c:491
-msgid "(AC on-line)"
-msgstr ""
-
-#: ../panel-plugin/battery.c:500
-#, c-format
-msgid "%d%% (%02d:%02d) remaining"
-msgstr ""
-
-#: ../panel-plugin/battery.c:502
-#, c-format
-msgid "%02d:%02d remaining"
-msgstr ""
-
-#: ../panel-plugin/battery.c:504
-#, c-format
-msgid "%d%% remaining"
-msgstr ""
-
-#: ../panel-plugin/battery.c:506
-msgid "AC off-line"
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 ""
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
