[Xfce4-commits] <xfce4-time-out-plugin:master> Package cleanup
Florian Rivoal
noreply at xfce.org
Thu Nov 11 16:24:01 CET 2010
Updating branch refs/heads/master
to 0f7ef4ef2d20d85b17f830f628816169b453af53 (commit)
from 47a8005e8cc2b843f32bce0981275dc0ece100e2 (commit)
commit 0f7ef4ef2d20d85b17f830f628816169b453af53
Author: Florian Rivoal <frivoal at xfce.org>
Date: Tue Nov 9 21:40:44 2010 +0900
Package cleanup
Remove svn fluf,remove the TODO that isn't really an accurate plan, and
update the autothings to take advantage of newer xfce-dev-tools.
INSTALL | 254 ++++++++++++++++++++++++++--------
Makefile.am | 2 -
TODO | 5 -
autogen.sh | 28 +---
configure.in.in => configure.ac.in | 11 +-
icons/48x48/Makefile.am | 2 -
icons/Makefile.am | 2 -
icons/scalable/Makefile.am | 2 -
panel-plugin/Makefile.am | 2 -
panel-plugin/time-out-countdown.c | 1 -
panel-plugin/time-out-countdown.h | 1 -
panel-plugin/time-out-fadeout.c | 1 -
panel-plugin/time-out-fadeout.h | 1 -
panel-plugin/time-out-lock-screen.c | 1 -
panel-plugin/time-out-lock-screen.h | 1 -
panel-plugin/time-out.c | 1 -
panel-plugin/time-out.h | 1 -
17 files changed, 205 insertions(+), 111 deletions(-)
diff --git a/INSTALL b/INSTALL
index 095b1eb..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,25 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
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. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +32,9 @@ 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
+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,30 +44,37 @@ 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'.
+`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:
+ 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.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
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
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. 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
@@ -67,65 +83,120 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
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.
+ 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
+ ./configure CC=c99 CFLAGS=-g 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
+ 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 `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ 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.
- 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.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+ 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', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+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.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
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
+ 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
@@ -137,14 +208,53 @@ 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.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
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
+ 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:
@@ -152,14 +262,15 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ 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 `--target=TYPE' option to select the type of system they will
+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
@@ -170,9 +281,9 @@ 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'.
+ 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.
@@ -181,7 +292,7 @@ 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
+ 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
@@ -189,17 +300,30 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -226,6 +350,16 @@ overridden in the site shell script).
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
index a5625b4..56fdc91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $
-
SUBDIRS = \
icons \
panel-plugin \
diff --git a/TODO b/TODO
deleted file mode 100644
index 1065795..0000000
--- a/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* Add about dialog.
-* Replace appointment icon with something better (either a sports watch
- or something like two hands forming a time out T).
-* Figure out how to track activity
-* Put optional frame around the plugin
diff --git a/autogen.sh b/autogen.sh
index ead840c..524cc63 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,35 +1,19 @@
#!/bin/sh
#
-# $Id: autogen.sh 2499 2007-02-18 20:59:26Z jannis $
-#
-# Copyright (c) 2002-2007
+# 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/.
-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.
+ Please install the xfce4-dev-tools package first, available from
+ http://xfce.org/~benny/projects/xfce4-dev-tools/.
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 93%
rename from configure.in.in
rename to configure.ac.in
index bd3db42..2a3174d 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -1,8 +1,7 @@
-dnl $Id: configure.in.in 2499 2007-02-18 20:59:26Z jannis $
-dnl
dnl xfce4-time-out-plugin - A panel plugin for breaks during work.
dnl
dnl 2007 Jannis Pohlmann <jannis at xfce.org>
+dnl 2010 Florian Rivoal <frivoal at xfce.org>
dnl
dnl ***************************
@@ -12,14 +11,14 @@ m4_define([time_out_version_major], [0])
m4_define([time_out_version_minor], [1])
m4_define([time_out_version_micro], [1])
m4_define([time_out_version_build], [r at REVISION@])
-m4_define([time_out_version_tag], [svn])
-m4_define([time_out_version], [time_out_version_major().time_out_version_minor().time_out_version_micro()ifelse(time_out_version_tag(), [svn], [time_out_version_tag()-time_out_version_build()], [time_out_version_tag()])])
+m4_define([time_out_version_tag], [git])
+m4_define([time_out_version], [time_out_version_major().time_out_version_minor().time_out_version_micro()ifelse(time_out_version_tag(), [git], [time_out_version_tag()-time_out_version_build()], [time_out_version_tag()])])
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2007
- Jannis Pohlmann <jannis at xfce.org>. All rights reserved.])
+AC_COPYRIGHT([Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
+Copyright (c) 2010 Florian Rivoal <frivoal at xfce.org>])
AC_INIT([xfce4-time-out-plugin], [time_out_version], [http://bugzilla.xfce.org/], [xfce4-time-out-plugin])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 8e027c1..7b44928 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2499 2007-02-18 20:59:26Z jannis $
-
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
xfce4-time-out-plugin.png
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 1c486e5..7cdf853 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2257 2006-12-19 19:49:00Z nick $
-
SUBDIRS = \
48x48 \
scalable
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index f28bda7..c9fec28 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2499 2007-02-18 20:59:26Z jannis $
-
iconsdir = $(datadir)/icons/hicolor/scalable/apps
icons_DATA = \
xfce4-time-out-plugin.svg
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 3e406c8..2f660fe 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2499 2007-02-18 20:59:26Z jannis $
-
plugindir = \
$(libexecdir)/xfce4/panel-plugins
diff --git a/panel-plugin/time-out-countdown.c b/panel-plugin/time-out-countdown.c
index 6ebf37d..18aa7f9 100644
--- a/panel-plugin/time-out-countdown.c
+++ b/panel-plugin/time-out-countdown.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out-countdown.h b/panel-plugin/time-out-countdown.h
index 84ef6f7..aeaf37c 100644
--- a/panel-plugin/time-out-countdown.h
+++ b/panel-plugin/time-out-countdown.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2006 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out-fadeout.c b/panel-plugin/time-out-fadeout.c
index cb39ca0..3bde599 100644
--- a/panel-plugin/time-out-fadeout.c
+++ b/panel-plugin/time-out-fadeout.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2004 Benedikt Meurer <benny at xfce.org>
diff --git a/panel-plugin/time-out-fadeout.h b/panel-plugin/time-out-fadeout.h
index 38d92d6..8d71716 100644
--- a/panel-plugin/time-out-fadeout.h
+++ b/panel-plugin/time-out-fadeout.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out-lock-screen.c b/panel-plugin/time-out-lock-screen.c
index 3dfcf69..7f0b6c3 100644
--- a/panel-plugin/time-out-lock-screen.c
+++ b/panel-plugin/time-out-lock-screen.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out-lock-screen.h b/panel-plugin/time-out-lock-screen.h
index 2549d4c..35641ca 100644
--- a/panel-plugin/time-out-lock-screen.h
+++ b/panel-plugin/time-out-lock-screen.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2006 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c
index b8e0b75..e5dc579 100644
--- a/panel-plugin/time-out.c
+++ b/panel-plugin/time-out.c
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vim:set et ai sw=2 sts=2: */
/*-
* Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
diff --git a/panel-plugin/time-out.h b/panel-plugin/time-out.h
index ca0d65b..8befe02 100644
--- a/panel-plugin/time-out.h
+++ b/panel-plugin/time-out.h
@@ -1,4 +1,3 @@
-/* $Id$ */
/* vi:set expandtab sw=2 sts=2: */
/*-
* Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
More information about the Xfce4-commits
mailing list