From 3084a9baad65904a50621ae5fb7daf74794198b4 Mon Sep 17 00:00:00 2001 From: Florian Rivoal Date: Thu, 16 Dec 2010 14:18:52 +0900 Subject: [PATCH] Clean up --- Makefile.am | 4 +- README | 5 +- autogen.sh | 27 ++--- configure.in.in => configure.ac.in | 8 +- icons/48x48/Makefile.am | 2 - icons/Makefile.am | 2 - panel-plugin/Makefile.am | 2 - panel-plugin/eyes.c | 4 +- panel-plugin/eyes.h | 4 +- panel-plugin/themes.c | 4 +- panel-plugin/themes.h | 4 +- po/ChangeLog | 175 ----------------------------- po/LINGUAS | 2 - po/xfce4-eyes-plugin.pot | 29 ----- themes/Bizarre/Makefile.am | 2 - themes/Bloodshot/Makefile.am | 2 - themes/Default-tiny/Makefile.am | 2 - themes/Default/Makefile.am | 2 - themes/Horrid/Makefile.am | 2 - themes/Makefile.am | 2 - themes/Tango/Makefile.am | 2 - xfce4-eyes.spec.in | 34 ------ 22 files changed, 17 insertions(+), 303 deletions(-) rename configure.in.in => configure.ac.in (94%) delete mode 100644 po/ChangeLog delete mode 100644 po/LINGUAS delete mode 100644 po/xfce4-eyes-plugin.pot delete mode 100644 xfce4-eyes.spec.in diff --git a/Makefile.am b/Makefile.am index 0387161..279f10c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ panel-plugin \ themes \ @@ -23,4 +21,4 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update -# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: \ No newline at end of file +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/README b/README index 4202f89..7636701 100644 --- a/README +++ b/README @@ -2,5 +2,6 @@ eyes is a xfce4 panel plugin that adds eyes which watch your every step. Scary! -Portions of the xfce4-eyes code were taken from geyes and are licensed under -the terms of the GNU General public license, see the COPYING.GPL file. +Portions of the xfce4-eyes code were taken from geyes. These, and the rest of +the code are licensed under the terms of the GNU General public license; see +the COPYING file. diff --git a/autogen.sh b/autogen.sh index 0055d5c..524cc63 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,32 +1,19 @@ #!/bin/sh # -# $Id: autogen.sh 1972 2006-09-06 08:21:54Z nick $ +# 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 </dev/null 2>&1 || { - cat >&2 < "configure.in" - -exec xdt-autogen $@ +xdt-autogen $@ diff --git a/configure.in.in b/configure.ac.in similarity index 94% rename from configure.in.in rename to configure.ac.in index cbb4b01..7a2d70c 100644 --- a/configure.in.in +++ b/configure.ac.in @@ -1,5 +1,3 @@ -dnl $Id$ -dnl dnl xfce4-eyes-plugin - eyes that spy on you dnl @@ -10,8 +8,8 @@ m4_define([eyes_version_major], [4]) m4_define([eyes_version_minor], [4]) m4_define([eyes_version_micro], [0]) m4_define([eyes_version_build], [r@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()])]) +m4_define([eyes_version_tag], [git]) +m4_define([eyes_version], [eyes_version_major().eyes_version_minor().eyes_version_micro()ifelse(eyes_version_tag(), [git], [eyes_version_tag()-eyes_version_build()], [eyes_version_tag()])]) dnl *************************** dnl *** Initialize autoconf *** @@ -21,7 +19,6 @@ AC_COPYRIGHT([Copyright (c) 2006-2007 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 *************************** dnl *** Initialize automake *** @@ -71,7 +68,6 @@ XDT_FEATURE_DEBUG() AC_OUTPUT([ Makefile -xfce4-eyes.spec po/Makefile.in panel-plugin/Makefile icons/Makefile diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am index c8ed01e..0685cf5 100644 --- a/icons/48x48/Makefile.am +++ b/icons/48x48/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/48x48/apps icons_DATA = \ xfce4-eyes.png diff --git a/icons/Makefile.am b/icons/Makefile.am index c9b3c6f..520b1c6 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ 48x48 diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 6779b0e..1ee4d28 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - INCLUDES = \ -I$(top_srcdir) \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c index 182924a..1524e5b 100644 --- a/panel-plugin/eyes.c +++ b/panel-plugin/eyes.c @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (c) Benedikt Meurer > +/* Copyright (c) Benedikt Meurer > * Copyright (c) Danny Milosavljevic * Copyright (c) Dave Camp * Copyright (c) Davyd Madeley diff --git a/panel-plugin/eyes.h b/panel-plugin/eyes.h index 422a78c..55d3eda 100644 --- a/panel-plugin/eyes.h +++ b/panel-plugin/eyes.h @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (C) 1999 Dave Camp +/* Copyright (C) 1999 Dave Camp * * 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 diff --git a/panel-plugin/themes.c b/panel-plugin/themes.c index e3dda1c..e0be092 100644 --- a/panel-plugin/themes.c +++ b/panel-plugin/themes.c @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (C) 1999 Dave Camp +/* Copyright (C) 1999 Dave Camp * * 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 diff --git a/panel-plugin/themes.h b/panel-plugin/themes.h index d705bde..3286e11 100644 --- a/panel-plugin/themes.h +++ b/panel-plugin/themes.h @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (C) 1999 Dave Camp +/* Copyright (C) 1999 Dave Camp * * 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 diff --git a/po/ChangeLog b/po/ChangeLog deleted file mode 100644 index 401665f..0000000 --- a/po/ChangeLog +++ /dev/null @@ -1,175 +0,0 @@ -2009-08-08 Mike Massonnet - - * ast.po: Asturian translation added (Marcos Alvarez Costales) - -2009-07-24 Gabor Kelemen - - * hu.po: Translation updated. - -2009-05-29 Mike Massonnet - - * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki) - * ur.po: Urdu translation update (Muhammad Ali Makki) - -2009-04-16 Mike Massonnet - - * gl.po: Galician translation update (Leandro Regueiro) - -2009-03-14 Maximilian Schleiss - - * gl.po: Galician translation update (Leandro Regueiro) - -2009-03-05 Mike Massonnet - - * pt.po: Renamed pt_PT.po to pt.po (bug #4574) - -2009-03-05 Mike Massonnet - - * nb.po: Renamed nb_NO.po to nb.po (bug #4574) - -2008-12-13 Alexander Toresson - - * sv.po: Swedish translation update (Daniel Nylander) - -2008-12-13 Maximilian Schleiss - - * zh_CN.po: Simplified Chinese translation update (Hunt Xu) - -2008-11-16 Eren Türkay - - * tr.po: Turkish translation update (Gökmen Görgen) - -2008-11-12 Piarres Beobide - - * eu.po: Basque translation update - -2008-11-09 Maximilian Schleiss - - * es.po: Spanish translation update (Abel Martín) - * sq.po: Albanian translation update (Besnik Bleta) - -2008-10-11 Lars Nielsen - - * da.po: Danish translation update - -2008-07-14 Maximilian Schleiss - - * gl.po: Galician translation update (Leandro Regueiro) - -2008-06-25 Maximilian Schleiss - - * id.po, LINGUAS: Indonesian translation added (Andhika Padmawan) - -2008-05-27 Mike Massonnet - - * da.po, LINGUAS: Add Danish translation (Jens Hyllegaard) - -2008-05-14 Mike Massonnet - - * ja.po: Update Japanese translation (Nobuhiro Iwamatsu) - -2008-05-10 Stavros Giannouris - - * el.po, LINGUAS: Added Greek translation by Evaggelos Balaskas - -2007-11-18 Maximilian Schleiss - - * lv.po: Latvian translation added - by Rihards Priedītis - -2007-11-15 Mike Massonnet - - * ur.po: Update translation by Muhammad Ali Makki - * pk.po, ur.po: Rename pk.po to ur.po. - -2007-10-28 Mike Massonnet - - * pk.po: Add new translation by محمد علي المكي - -2007-08-25 Og Maciel - - * pt_BR: Brazilian Portuguese translation updated - by Vladimir Melo - -2007-06-20 Maximilian Schleiss - - * pt_PT: European Portuguese translation updated - by Nuno Miguel - -2007-06-13 Maximilian Schleiss - - * it.po: Updated the translation - by Roberto Pariset - -2007-03-31 Pau Rul-lan Ferragut - - * gb.po: British translation - by Jeff Bailes - -2007-03-13 Maxim Dziumanenko - - * uk.po: Update Ukrainian translation by Dmitry Nikitin - -2007-02-02 Maximilian Schleiss - - * fr.po: Added the Albanian translation by - Besnik Bleta - -2007-01-20 Jari Rahkonen - - * fi.po: Updated Finnish translation - -2007-01-20 Alexander Nyakhaychyk - - * be.po: Updated Belarusian Translation - -2006-12-15 Pau Rul-lan Ferragut - - * ca.po: Updated Catalan translation - by Carles Muñoz Gorriz - -2006-12-11 Maximilian Schleiss - - * ko.po: Updated the Korean translation by - ByungHyun Choi - -2006-11-03 Adriano Winter Bess - - * pt_BR.po: Updated brazilian portuguese translations. - -2006-10-03 Jean-François Wauthy - - * nl.po: Updated Dutch translations by Stephan Arts - -2006-09-23 Jean-François Wauthy - - * cs.po: Updated Czech translations by Michal Varady - - * de.po: Updated German translations by Ronny Steiner - - * fr.po: Updated French translations by Maximilian Schleiss - - -2006-09-19 Piarres Beobide - - * eu.po: Updated Basque trasnslations - -2006-09-17 Jean-François Wauthy - - * pl.po: Updated Polish translations - -2006-09-07 Sylvain Vedrenne - - * eo.po: Added Esperanto translations by Jarbas Araujo - - -2005-07-17 Danny Milosavljevic - - * ChangeLog, Makefile.in.in, POTFILES.in, POTFILES.in~, ar.po, - az.po, be.po, bg.po, bn_IN.po, ca.po, cs.po, de.po, en_GB.po, - es.po, es_MX.po, et.po, eu.po, fa.po, fi.po, fr.po, gu.po, - he.po, hi.po, hu.po, it.po, ja.po, ko.po, lt.po, mr.po, ms.po, - nb_NO.po, nl.po, pa.po, pl.po, pt_BR.po, pt_PT.po, ro.po, - ru.po, sk.po, sv.po, ta.po, tr.po, uk.po, vi.po, - xfce4-toys.pot, zh_CN.po, zh_TW.po: add translations - diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 64ff42b..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ar ast az be bg bn_IN ca cs da de el en_GB es es_MX et eu fa fi fr gl gu he hi hu id it ja ko lt lv mr ms nl nb pa pl pt_BR pt ro ru sv sk ta tr uk ur ur_PK vi zh_CN zh_TW diff --git a/po/xfce4-eyes-plugin.pot b/po/xfce4-eyes-plugin.pot deleted file mode 100644 index c4a9b74..0000000 --- a/po/xfce4-eyes-plugin.pot +++ /dev/null @@ -1,29 +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 , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-11 15:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../panel-plugin/eyes.c:288 ../panel-plugin/eyes.desktop.in.in.h:1 -msgid "Eyes" -msgstr "" - -#: ../panel-plugin/eyes.c:304 -msgid "_Select a theme:" -msgstr "" - -#: ../panel-plugin/eyes.desktop.in.in.h:2 -msgid "Eyes that spy on you" -msgstr "" diff --git a/themes/Bizarre/Makefile.am b/themes/Bizarre/Makefile.am index 1ef65c6..6d4679c 100644 --- a/themes/Bizarre/Makefile.am +++ b/themes/Bizarre/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Bizarredir = $(datadir)/xfce4/eyes/themes/Bizarre Bizarre_DATA = \ diff --git a/themes/Bloodshot/Makefile.am b/themes/Bloodshot/Makefile.am index 2359fee..90b42e2 100644 --- a/themes/Bloodshot/Makefile.am +++ b/themes/Bloodshot/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Bloodshotdir = $(datadir)/xfce4/eyes/themes/Bloodshot Bloodshot_DATA = \ diff --git a/themes/Default-tiny/Makefile.am b/themes/Default-tiny/Makefile.am index a4b7a6e..ef9deb6 100644 --- a/themes/Default-tiny/Makefile.am +++ b/themes/Default-tiny/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Default_tinydir = $(datadir)/xfce4/eyes/themes/Default-tiny Default_tiny_DATA = \ diff --git a/themes/Default/Makefile.am b/themes/Default/Makefile.am index a70c69f..16a5172 100644 --- a/themes/Default/Makefile.am +++ b/themes/Default/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Defaultdir = $(datadir)/xfce4/eyes/themes/Default Default_DATA = \ diff --git a/themes/Horrid/Makefile.am b/themes/Horrid/Makefile.am index ce0bfed..cab73bb 100644 --- a/themes/Horrid/Makefile.am +++ b/themes/Horrid/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Horriddir = $(datadir)/xfce4/eyes/themes/Horrid Horrid_DATA = \ diff --git a/themes/Makefile.am b/themes/Makefile.am index de46cc4..a646814 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ Bizarre \ Bloodshot \ diff --git a/themes/Tango/Makefile.am b/themes/Tango/Makefile.am index 86806d4..83c9dda 100644 --- a/themes/Tango/Makefile.am +++ b/themes/Tango/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - Tangodir = $(datadir)/xfce4/eyes/themes/Tango Tango_DATA = \ diff --git a/xfce4-eyes.spec.in b/xfce4-eyes.spec.in deleted file mode 100644 index 78b56ea..0000000 --- a/xfce4-eyes.spec.in +++ /dev/null @@ -1,34 +0,0 @@ -Summary: Eyes that spy on you -Name: xfce4-eyes -Version: @VERSION@ -Release: 1 -License: BSD -URL: http://www.xfce.org/ -Source0: %{name}-%{version}.tar.gz -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root -Requires: xfce4-panel >= @XFCE4_PANEL_REQUIRED_VERSION@ -BuildRequires: xfce4-panel >= @XFCE4_PANEL_REQUIRED_VERSION@ - -%description -xfce4-eyes is an "xeyes"/geyes rip-off - -%prep -%setup -q - -%build -%configure -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc README ChangeLog NOTES INSTALL COPYING AUTHORS -%{_libdir}/* -%{_datadir}/*