[Goodies-commits] r5530 - in xfce4-power-manager/trunk: . data/icons/scalable po src
Ali Abdallah
aliov at xfce.org
Tue Oct 7 10:29:23 CEST 2008
Author: aliov
Date: 2008-10-07 08:29:23 +0000 (Tue, 07 Oct 2008)
New Revision: 5530
Modified:
xfce4-power-manager/trunk/INSTALL
xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
xfce4-power-manager/trunk/po/Makefile
xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
added cpu icon
Modified: xfce4-power-manager/trunk/INSTALL
===================================================================
--- xfce4-power-manager/trunk/INSTALL 2008-10-07 07:47:23 UTC (rev 5529)
+++ xfce4-power-manager/trunk/INSTALL 2008-10-07 08:29:23 UTC (rev 5530)
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
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
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@@ -35,20 +38,17 @@
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'.
+`configure' by a program called `autoconf'. You 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.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@
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
+own directory. To do this, you can use 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.
+ With a non-GNU `make', it is safer 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
==================
@@ -190,12 +191,12 @@
./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:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
Modified: xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/icons/scalable/Makefile.am 2008-10-07 07:47:23 UTC (rev 5529)
+++ xfce4-power-manager/trunk/data/icons/scalable/Makefile.am 2008-10-07 08:29:23 UTC (rev 5530)
@@ -42,4 +42,5 @@
gpm-mouse-000.svg \
gpm-mouse-030.svg \
gpm-mouse-060.svg \
- gpm-mouse-100.svg
\ No newline at end of file
+ gpm-mouse-100.svg \
+ gnome-cpu-frequency-applet.svg
\ No newline at end of file
Modified: xfce4-power-manager/trunk/po/Makefile
===================================================================
--- xfce4-power-manager/trunk/po/Makefile 2008-10-07 07:47:23 UTC (rev 5529)
+++ xfce4-power-manager/trunk/po/Makefile 2008-10-07 08:29:23 UTC (rev 5530)
@@ -67,30 +67,6 @@
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
- tmpdir=`pwd`; \
- linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
- if $$result; then \
- if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
- rm -f $$tmpdir/$$lang.new.po; \
- else \
- if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
- :; \
- else \
- echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
- rm -f $$tmpdir/$$lang.new.po; \
- exit 1; \
- fi; \
- fi; \
- else \
- echo "msgmerge for $$lang.gmo failed!"; \
- rm -f $$tmpdir/$$lang.new.po; \
- fi; \
- done
-
-Makefile POTFILES: stamp-it
@if test ! -f $@; then \
rm -f stamp-it; \
$(MAKE) stamp-it; \
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-07 07:47:23 UTC (rev 5529)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-07 08:29:23 UTC (rev 5530)
@@ -830,7 +830,7 @@
gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
- pix = xfpm_load_icon("gpm-suspend",42);
+ pix = xfpm_load_icon("gnome-cpu-frequency-applet",42);
gtk_list_store_append(list_store,&iter);
gtk_list_store_set(list_store,&iter,0,pix,1,0,-1);
g_object_unref(pix);
More information about the Goodies-commits
mailing list