[Goodies-commits] r2397 - in xfce4-eyes-plugin/trunk: . icons icons/48x48 panel-plugin themes themes/Bizarre themes/Bloodshot themes/Default themes/Default-tiny themes/Horrid themes/Tango
Nick Schermer
nick at xfce.org
Wed Jan 17 18:46:35 CET 2007
Author: nick
Date: 2007-01-17 17:46:35 +0000 (Wed, 17 Jan 2007)
New Revision: 2397
Modified:
xfce4-eyes-plugin/trunk/ChangeLog
xfce4-eyes-plugin/trunk/Makefile.am
xfce4-eyes-plugin/trunk/configure.in.in
xfce4-eyes-plugin/trunk/icons/48x48/Makefile.am
xfce4-eyes-plugin/trunk/icons/Makefile.am
xfce4-eyes-plugin/trunk/panel-plugin/Makefile.am
xfce4-eyes-plugin/trunk/panel-plugin/eyes.c
xfce4-eyes-plugin/trunk/panel-plugin/eyes.h
xfce4-eyes-plugin/trunk/panel-plugin/themes.c
xfce4-eyes-plugin/trunk/panel-plugin/themes.h
xfce4-eyes-plugin/trunk/themes/Bizarre/Makefile.am
xfce4-eyes-plugin/trunk/themes/Bloodshot/Makefile.am
xfce4-eyes-plugin/trunk/themes/Default-tiny/Makefile.am
xfce4-eyes-plugin/trunk/themes/Default/Makefile.am
xfce4-eyes-plugin/trunk/themes/Horrid/Makefile.am
xfce4-eyes-plugin/trunk/themes/Makefile.am
xfce4-eyes-plugin/trunk/themes/Tango/Makefile.am
Log:
* Improve configure and make files.
* Bump version for release.
* Set svn keywords.
Modified: xfce4-eyes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-eyes-plugin/trunk/ChangeLog 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/ChangeLog 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,9 @@
+2007-01-17 Nick Schermer <nick at xfce.org>
+
+ * Improve configure and make files.
+ * Bump version for release.
+ * Set svn keywords.
+
2006-09-11 15:00 nick
* Update to new panel api
Modified: xfce4-eyes-plugin/trunk/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
SUBDIRS = \
panel-plugin \
themes \
@@ -4,10 +6,6 @@
icons \
po
-AUTOMAKE_OPTIONS = \
- 1.8 \
- dist-bzip2
-
distclean-local:
rm -rf *.spec *.cache *~
@@ -24,3 +22,5 @@
intltool-extract \
intltool-merge \
intltool-update
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
\ No newline at end of file
Property changes on: xfce4-eyes-plugin/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/configure.in.in
===================================================================
--- xfce4-eyes-plugin/trunk/configure.in.in 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/configure.in.in 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,46 +1,71 @@
-dnl configure.in.in
+dnl $Id$
dnl
dnl xfce4-eyes-plugin - eyes that spy on you
dnl
-dnl
-dnl version info
-m4_define([eyes_version], [4.3.99.1])
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([eyes_version_major], [4])
+m4_define([eyes_version_minor], [4])
+m4_define([eyes_version_micro], [0])
+m4_define([eyes_version_build], [r at REVISION@])
+m4_define([eyes_version_tag], [svn])
+m4_define([eyes_version], [eyes_version_major().eyes_version_minor().eyes_version_micro()ifelse(eyes_version_tag(), [svn], [eyes_version_tag()-eyes_version_build()], [eyes_version_tag()])])
-dnl init autoconf
-AC_INIT([xfce4-eyes-plugin], [eyes_version], [goodies-dev at xfce.org])
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+ The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-eyes-plugin], [eyes_version()], [http://bugzilla.xfce.org/], [xfce4-eyes-plugin])
AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id])
-dnl init automake
-EYES_VERSION=eyes_version
-AM_INIT_AUTOMAKE([xfce4-eyes-plugin], [$EYES_VERSION])
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
-dnl check for basic programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
AC_PROG_INTLTOOL()
-dnl check for standard header files
-AC_HEADER_STDC
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
AC_CHECK_HEADERS([math.h])
-dnl check for math library
+dnl ******************************
+dnl *** Check for math library ***
+dnl ******************************
AC_CHECK_LIB([m], [sin])
-dnl check for i18n support
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
XDT_I18N([@LINGUAS@])
-dnl check for required packages
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
-dnl check for debugging support
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
XDT_FEATURE_DEBUG()
AC_OUTPUT([
Modified: xfce4-eyes-plugin/trunk/icons/48x48/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/icons/48x48/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/icons/48x48/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
xfce4-eyes.png
@@ -4,3 +6,5 @@
EXTRA_DIST = \
$(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/icons/48x48/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/icons/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/icons/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/icons/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,4 @@
+# $Id$
SUBDIRS = \
48x48
@@ -14,3 +15,5 @@
echo "*** $(gtk_update_icon_cache)"; \
echo "***"; \
fi
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/icons/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,10 @@
+# $Id$
+
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ -DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
+
plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-eyes-plugin
@@ -8,12 +15,9 @@
themes.c
xfce4_eyes_plugin_CFLAGS = \
- -I$(top_srcdir) \
$(LIBXFCEGUI4_CFLAGS) \
- $(LIBXFCE4PANEL_CFLAGS) \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
-
+ $(LIBXFCE4PANEL_CFLAGS)
+
xfce4_eyes_plugin_LDADD = \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCEGUI4_LIBS)
@@ -33,3 +37,4 @@
$(desktop_in_files) \
$(desktop_DATA)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/panel-plugin/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/panel-plugin/eyes.c
===================================================================
--- xfce4-eyes-plugin/trunk/panel-plugin/eyes.c 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/panel-plugin/eyes.c 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,4 +1,5 @@
-/*
+/* $Id$
+ *
* Copyright (c) Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>>
* Copyright (c) Danny Milosavljevic <danny_milo at gmx.net>
* Copyright (c) Dave Camp
Property changes on: xfce4-eyes-plugin/trunk/panel-plugin/eyes.c
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/panel-plugin/eyes.h
===================================================================
--- xfce4-eyes-plugin/trunk/panel-plugin/eyes.h 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/panel-plugin/eyes.h 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,6 +1,22 @@
+/* $Id$
+ *
+ * Copyright (C) 1999 Dave Camp <dave at davec.dhs.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
-
-
#ifndef __EYES_H__
#define __EYES_H__
Property changes on: xfce4-eyes-plugin/trunk/panel-plugin/eyes.h
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/panel-plugin/themes.c
===================================================================
--- xfce4-eyes-plugin/trunk/panel-plugin/themes.c 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/panel-plugin/themes.c 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,4 +1,5 @@
-/*
+/* $Id$
+ *
* Copyright (C) 1999 Dave Camp <dave at davec.dhs.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#include <config.h>
Property changes on: xfce4-eyes-plugin/trunk/panel-plugin/themes.c
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/panel-plugin/themes.h
===================================================================
--- xfce4-eyes-plugin/trunk/panel-plugin/themes.h 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/panel-plugin/themes.h 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,22 @@
+/* $Id$
+ *
+ * Copyright (C) 1999 Dave Camp <dave at davec.dhs.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
#ifndef __THEMES_H__
#define __THEMES_H__
#include <gtk/gtk.h>
Property changes on: xfce4-eyes-plugin/trunk/panel-plugin/themes.h
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Bizarre/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Bizarre/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Bizarre/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Bizarredir = $(datadir)/xfce4/eyes/themes/Bizarre
Bizarre_DATA = \
@@ -6,3 +8,5 @@
config
EXTRA_DIST = $(Bizarre_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Bizarre/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Bloodshot/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Bloodshot/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Bloodshot/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Bloodshotdir = $(datadir)/xfce4/eyes/themes/Bloodshot
Bloodshot_DATA = \
@@ -6,3 +8,5 @@
config
EXTRA_DIST = $(Bloodshot_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Bloodshot/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Default/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Default/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Default/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Defaultdir = $(datadir)/xfce4/eyes/themes/Default
Default_DATA = \
@@ -6,3 +8,5 @@
config
EXTRA_DIST = $(Default_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Default/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Default-tiny/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Default-tiny/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Default-tiny/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Default_tinydir = $(datadir)/xfce4/eyes/themes/Default-tiny
Default_tiny_DATA = \
@@ -6,3 +8,5 @@
config
EXTRA_DIST = $(Default_tiny_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Default-tiny/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Horrid/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Horrid/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Horrid/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Horriddir = $(datadir)/xfce4/eyes/themes/Horrid
Horrid_DATA = \
@@ -6,3 +8,5 @@
config
EXTRA_DIST = $(Horrid_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Horrid/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
SUBDIRS = \
Bizarre \
Bloodshot \
@@ -5,3 +7,5 @@
Default-tiny \
Horrid \
Tango
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-eyes-plugin/trunk/themes/Tango/Makefile.am
===================================================================
--- xfce4-eyes-plugin/trunk/themes/Tango/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
+++ xfce4-eyes-plugin/trunk/themes/Tango/Makefile.am 2007-01-17 17:46:35 UTC (rev 2397)
@@ -1,3 +1,5 @@
+# $Id$
+
Tangodir = $(datadir)/xfce4/eyes/themes/Tango
Tango_DATA = \
@@ -7,3 +9,5 @@
EXTRA_DIST = \
$(Tango_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-eyes-plugin/trunk/themes/Tango/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the Goodies-commits
mailing list