[Xfce4-commits] <xfce4-cpufreq-plugin:master> Clean up and auto tools fixes
Florian Rivoal
noreply at xfce.org
Tue Dec 28 12:02:01 CET 2010
Updating branch refs/heads/master
to db8d70562927012871895a126bbe6673f34b2a59 (commit)
from 2354b959fcec6a8dd09dff11de0f3bca891e5703 (commit)
commit db8d70562927012871895a126bbe6673f34b2a59
Author: Florian Rivoal <frivoal at xfce.org>
Date: Tue Dec 28 19:11:49 2010 +0900
Clean up and auto tools fixes
INSTALL | 236 ---------------------------------------
autogen.sh | 15 +--
configure.ac => configure.ac.in | 7 +-
panel-plugin/Makefile.am | 2 +-
po/ChangeLog | 173 ----------------------------
po/LINGUAS | 2 -
po/xfce4-cpufreq-plugin.pot | 47 --------
7 files changed, 11 insertions(+), 471 deletions(-)
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 23e5f25..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/autogen.sh b/autogen.sh
index 4b33ff9..6bc0c8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,23 +1,20 @@
#!/bin/sh
#
-# $Id: autogen.sh 1355 2006-08-08 21:01:13Z shrek $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
+
+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
}
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+xdt-autogen $@
diff --git a/configure.ac b/configure.ac.in
similarity index 91%
rename from configure.ac
rename to configure.ac.in
index e7bc060..f21d6bb 100644
--- a/configure.ac
+++ b/configure.ac.in
@@ -8,9 +8,10 @@ dnl Version information
m4_define([xfce4_cpufreq_plugin_version], [0.2])
dnl Initialize autoconf
-AC_COPYRIGHT([Copyright (c) 2006 Thomas Schreck <shrek at xfce.org>])
+AC_COPYRIGHT([Copyright (c) 2006 Thomas Schreck <shrek at xfce.org>
+Copyright (c) 2010 Florian Rivoal <frivoal at xfce.org>])
AC_INIT([xfce4-cpufreq-plugin], [xfce4_cpufreq_plugin_version()],
- [shrek at xfce.org])
+ [frivoal at xfce.org])
dnl Initialize automake
AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
@@ -24,7 +25,7 @@ AC_PROG_LIBTOOL
AC_PROG_INTLTOOL()
dnl Check for i18n support
-XDT_I18N([ca cs en_GB eu fr it nb_NO pl pt_PT sq uk])
+XDT_I18N([@LINGUAS@])
dnl configure the panel plugin
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index c660c63..d890f85 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -8,7 +8,7 @@ xfce4_cpufreq_plugin_CFLAGS = \
@LIBXFCEGUI4_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-xfce4_cpufreq_plugin_LDFLAGS = \
+xfce4_cpufreq_plugin_LDADD = \
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCEGUI4_LIBS@
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 9d33caf..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,173 +0,0 @@
-2009-08-08 Mike Massonnet <mmassonnet at xfce.org>
-
- * ast.po: Asturian translation added (Marcos Alvarez Costales)
-
-2009-07-25 Gabor Kelemen <kelemeng at gnome.hu>
-
- * hu.po: Translation updated.
-
-2009-05-29 Mike Massonnet <mmassonnet at xfce.org>
-
- * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
- * ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-04-20 Mike Massonnet <mmassonnet at xfce.org>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-16 Mike Massonnet <mmassonnet at xfce.org>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-14 Maximilian Schleiss <maximilian at xfce.org>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-05 Mike Massonnet <mmassonnet at xfce.org>
-
- * pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-03-05 Mike Massonnet <mmassonnet at xfce.org>
-
- * nb.po: Renamed nb_NO.po to nb.po (bug #4574)
-
-2009-02-22 Mike Massonnet <mmassonnet at xfce.org>
-
- * es.po: Add Spanish translation (Abel Martín)
-
-2009-02-20 Eren Türkay <erenturkay at xfce.org>
-
- * tr.po: Add Turkish translation by Samed Beyribey
-
-2008-12-25 Maximilian Schleiss <maximilian at xfce.org>
-
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2008-12-20 Alexander Toresson <eulex at xfce.org>
-
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-12-13 Maximilian Schleiss <maximilian at xfce.org>
-
- * zh_CN.po: Simplified Chinese translation added (Hunt Xu)
-
-2008-11-09 Maximilian Schleiss <maximilian at xfce.org>
-
- * sq.po: Albanian translation update (Besnik Bleta)
-
-2008-10-18 Maximilian Schleiss <maximilian at xfce.org>
-
- * ja.po, LINGUAS: Japanese translation added (Nobuhiro Iwamatsu)
-
-2008-10-12 Lars Nielsen <lars at mit-web.dk>
-
- * da.po: Updated danish translation
-
-2008-07-15 Mohamed Magdy <alnokta at xfce.org>
-
- * ar.po: Add Arabic translation
-
-2008-06-26 Maximilian Schleiss <maximilian at xfce.org>
-
- * gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
-
-2008-06-22 Mike Massonnet <mmassonnet at xfce.org>
-
- * id.po, LINGUAS: Add Indonesian translation (Andhika Padmawan)
-
-2008-05-27 Mike Massonnet <mmassonnet at xfce.org>
-
- * da.po, LINGUAS: Add Danish translation (Jens Hyllegaard)
-
-2008-03-30 Stavros Giannouris <stavrosg at hellug.gr>
-
- * el.po, LINGUAS: Added Greek translation by Evaggelos Balaskas
- <ebalaskas at ebalaskas.gr>
-
-2007-12-07 Maximilian Schleiss <maximilian at xfce.org>
-
- * de.po: German translation added
- by Fabian Nowak <timystery at arcor.de>
-
-2007-11-18 Maximilian Schleiss <maximilian at xfce.org>
-
- * lv.po: Latvian translation added
- by Rihards Priedītis <rprieditis at inbox.lv>
-
-2007-11-15 Mike Massonnet <mmassonnet at xfce.org>
-
- * ur.po: Update translation
- by Muhammad Ali Makki <makki.ma at gmail.com>
- * pk.po, ur.po: Rename pk.po to ur.po.
-
-2007-11-03 Maximilian Schleiss <maximilian at xfce.org>
-
- * it.po: Italian translation update
- by Fabio Riga <usul at aruba.it>
-
-2007-10-28 Mike Massonnet <mmassonnet at xfce.org>
-
- * pk.po: Add new translation
- by محمد علي المكي <makki.ma at gmail.com>
-
-2007-09-04 Og Maciel <ogmaciel at gnome.org>
-
- * Added missing LINGUAS file
-
-2007-09-03 Og Maciel <ogmaciel at gnome.org>
-
- * pt_BR.po: Brazilian Portuguese translation added
- by Fábio Nogueira <deb-user-ba at ubuntu.com>
-
-2007-07-08 Maximilian Schleiss <maximilian at xfce.org>
-
- * nb_NO.po: Norwegian Bokmal translation added
- by Terje Uriansrud <ter at operamail.com>
- * pt_PT.po: European Protuguese translation added
- by Nuno Miguel <nunis at netcabo.pt>
-
-2007-06-13 Maximilian Schleiss <maximilian at xfce.org>
-
- * it.po: Added translation
- by Roberto Pariset <robdebian at gmail.com>
-
-2007-03-31 Pau Rul-lan Ferragut <paurullan at bulma.net>
-
- * gb.po: British translation
- by Jeff Bailes <thepizzaking at gmail.com>
-
-2007-03-14 Piarres Beobide <pi at beobide.net>
-
- * eu.po: Added basque translation
-
-2007-03-13 Maxim Dziumanenko <dziumanenko at gmail.com>
-
- * uk.po: Update Ukrainian translation by Dmitry Nikitin
-
-2007-02-20 Maximilian Schleiss <maximilian at xfce.org>
-
- * sq.po: Modified the headers for the Albanian translation
- by Besnik Bleta <besnik at programeshqip.org>
-
-2007-02-02 Maximilian Schleiss <maximilian at xfce.org>
-
- * fr.po: Added the Albanian translation
- by Besnik Bleta <besnik at programeshqip.org>
-
-2006-12-15 Pau Rul-lan Ferragut <paurullan at bulma.net>
-
- * ca.po: Added Catalan translation
- by Carles Muñoz Gorriz <carlesmu at ya.com>
-
-2006-09-23 Jean-François Wauthy <pollux at xfce.org>
-
- * fr.po: Add French translations by Gerald Barre <g.barre at free.fr>
-
-2006-09-03 Jean-François Wauthy <pollux at xfce.org>
-
- * pl.po: Add Polish translations
-
-2006-08-27 Jean-François Wauthy <pollux at xfce.org>
-
- * cs.po: Add Czech translations
-
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index a2c571e..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 fr gl id it ja lv nb pl pt_BR pt sq sv tr uk ur ur_PK zh_CN
diff --git a/po/xfce4-cpufreq-plugin.pot b/po/xfce4-cpufreq-plugin.pot
deleted file mode 100644
index 56227ec..0000000
--- a/po/xfce4-cpufreq-plugin.pot
+++ /dev/null
@@ -1,47 +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 <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:72
-#, c-format
-msgid "%d cpu available"
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:74
-msgid "Frequency: "
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:79
-msgid "Governor: "
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:249
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:274
-msgid "Could not create widgets !"
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.c:271
-msgid "Could not initialize linux backend !"
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:1
-msgid "CPU Frequency Monitor"
-msgstr ""
-
-#: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:2
-msgid "Shows the cpu frequency and governours"
-msgstr ""
More information about the Xfce4-commits
mailing list