From 2126f517df35716a55be1be2dc1b40c3a8e1befc Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 30 Aug 2008 10:38:34 +0100 Subject: [PATCH] Get ready for 1.1 release --- configure.ac | 2 +- debian/Makefile.am | 5 +- debian/changelog | 6 + debian/control | 10 +- debian/copyright | 4 +- debian/init.d.lsb.ex | 281 ------------------------------------- debian/{watch.ex => watch} | 0 debian/xcowsay-default.ex | 10 -- po/pt_BR.po | 5 +- po/xcowsay.pot | 6 +- src/xcowsay.c | 2 +- 11 files changed, 23 insertions(+), 308 deletions(-) delete mode 100644 debian/init.d.lsb.ex rename debian/{watch.ex => watch} (100%) delete mode 100644 debian/xcowsay-default.ex diff --git a/configure.ac b/configure.ac index b7a5695..a4a3a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([xcowsay], [1.1rc2], +AC_INIT([xcowsay], [1.1], [Nick Gasson ], [xcowsay]) AM_INIT_AUTOMAKE([-Wall]) diff --git a/debian/Makefile.am b/debian/Makefile.am index aa9670d..e406701 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,5 +1,4 @@ -EXTRA_DIST = changelog docs init.d.lsb.ex postrm.ex xcowsay-default.ex \ +EXTRA_DIST = changelog docs postrm.ex \ compat preinst.ex xcowsay.substvars \ control prerm.ex copyright \ - rules dirs files postinst.ex \ - watch.ex + rules dirs files postinst.ex watch diff --git a/debian/changelog b/debian/changelog index e4dee70..91b5dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xcowsay (1.1) unstable; urgency=low + + * Initial release of xcowsay 1.1 + + -- Nick Gasson Sat, 30 Aug 2008 10:35:00 +0000 + xcowsay (1.1rc1) unstable; urgency=low * Beta release of xcowsay 1.1 diff --git a/debian/control b/debian/control index 9f30eb0..0881b9e 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,19 @@ Source: xcowsay Section: games Priority: optional -Maintainer: Nick Gasson +Maintainer: Nick Gasson Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev, libglib2.0-dev Standards-Version: 3.7.2 Package: xcowsay Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk2.0-0, libglib2.0-0 +Depends: ${shlibs:Depends}, libgtk2.0-0, libglib2.0-0 Description: Graphical configurable talking cow A graphical configurable talking cow. It's a GTK+ version of the classic cowsay Perl script. It displays a cute pop-up cow on your - desktop with a speech bubble and some customizable text. It comes + desktop with a speech bubble and some customizable text. There's + also a dream mode where the cow can display images. It comes with a fortune(6) wrapper script, xcowfortune, which you can cron - to deliver periodic fortune cookies of joy via the cow. It even has + to deliver periodic fortune cookies via the cow. It even has a daemon mode which lets you send the cow messages over DBus! diff --git a/debian/copyright b/debian/copyright index bc40117..a27c0d8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ It was downloaded from: http://www.nickg.me.uk/files/xcowsay-0.6.tar.gz Upstream Author(s): - Nick Gasson + Nick Gasson Copyright: @@ -29,5 +29,5 @@ License: On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL-3'. -The Debian packaging is (C) 2008, Nick Gasson and +The Debian packaging is (C) 2008, Nick Gasson and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian/init.d.lsb.ex b/debian/init.d.lsb.ex deleted file mode 100644 index 4f73415..0000000 --- a/debian/init.d.lsb.ex +++ /dev/null @@ -1,281 +0,0 @@ -#!/bin/sh -# -# Example init.d script with LSB support. -# -# Please read this init.d carefully and modify the sections to -# adjust it to the program you want to run. -# -# Copyright (c) 2007 Javier Fernandez-Sanguino -# -# This is free software; you may 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, -# or (at your option) any later version. -# -# This 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 with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: xcowsay -# Required-Start: $network $local_fs -# Required-Stop: -# Should-Start: $named -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -DAEMON=/usr/sbin/xcowsay # Introduce the server's location here -NAME=#PACKAGE # Introduce the short server's name here -DESC=#PACKAGE # Introduce a short description here -LOGDIR=/var/log/xcowsay # Log directory to use - -PIDFILE=/var/run/$NAME.pid - -test -x $DAEMON || exit 0 -test -x $DAEMON_WRAPPER || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/$NAME -DAEMON_OPTS="" # Additional options given to the server - -DODTIME=10 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -LOGFILE=$LOGDIR/$NAME.log # Server logfile -#DAEMONUSER=xcowsay # Users to run the daemons as. If this value - # is set start-stop-daemon will chuid the server - -# Include defaults if available -if [ -f /etc/default/$NAME ] ; then - . /etc/default/$NAME -fi - -# Use this if you want the user to explicitly set 'RUN' in -# /etc/default/ -#if [ "x$RUN" != "xyes" ] ; then -# log_failure_msg "$NAME disabled, please adjust the configuration to your needs " -# log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it." -# exit 1 -#fi - -# Check that the user exists (if we set a user) -# Does the user exist? -if [ -n "$DAEMONUSER" ] ; then - if getent passwd | grep -q "^$DAEMONUSER:"; then - # Obtain the uid and gid - DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'` - DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'` - else - log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist." - exit 1 - fi -fi - - -set -e - -running_pid() { -# Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` - # Is this the expected server - [ "$cmd" != "$name" ] && return 1 - return 0 -} - -running() { -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - pid=`cat $PIDFILE` - running_pid $pid $DAEMON_WRAPPER || return 1 - return 0 -} - -start_server() { -# Start the process using the wrapper - if [ -z "$DAEMONUSER" ] ; then - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS - errcode=$? - else -# if we are using a daemonuser then change the user id - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --chuid $DAEMONUSER \ - --exec $DAEMON -- $DAEMON_OPTS - errcode=$? - fi - return $errcode -} - -stop_server() { -# Stop the process using the wrapper - if [ -z "$DAEMONUSER" ] ; then - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON - errcode=$ - else -# if we are using a daemonuser then look for process that match - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER \ - --exec $DAEMON - errcode=$ - fi - - return $errcode -} - -reload_server() { - [ ! -f "$PIDFILE" ] && return 1 - pid=`cat $PIDFILE` # This is the daemon's pid - # Send a SIGHUP - kill -1 $pid - return $? -} - -force_stop() { -# Force the process to die killing it manually - [ ! -e "$PIDFILE" ] && return - if running ; then - kill -15 $pid - # Is it really dead? - sleep "$DIETIME"s - if running ; then - kill -9 $pid - sleep "$DIETIME"s - if running ; then - echo "Cannot kill $NAME (pid=$pid)!" - exit 1 - fi - fi - fi - rm -f $PIDFILE -} - - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_server && running ; then - # It's ok, the server started and is running - log_end_msg 0 - else - # Either we could not start it or it is not running - # after we did - # NOTE: Some servers might die some time after they start, - # this code does not try to detect this and might give - # a false positive (use 'status' for that) - log_end_msg 1 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the server if we see it running - stop_server - log_end_msg $? - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - force-stop) - # First try to stop gracefully the program - $0 stop - if running; then - # If it's still running try to kill it more forcefully - log_daemon_msg "Stopping (force) $DESC" "$NAME" - force_stop - log_end_msg $? - fi - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - stop_server - # Wait some sensible amount, some server need this - [ -n "$DIETIME" ] && sleep $DIETIME - start_server - running - log_end_msg $? - ;; - status) - - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - # Use this if the daemon cannot reload - reload) - log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" - log_warning_msg "cannot re-read the config file (use restart)." - ;; - # And this if it cann - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # log_daemon_msg "Reloading $DESC configuration files" "$NAME" - # if running ; then - # reload_server - # if ! running ; then - # Process died after we tried to reload - # log_progress_msg "died on reload" - # log_end_msg 1 - # exit 1 - # fi - # else - # log_progress_msg "server is not running" - # log_end_msg 1 - # exit 1 - # fi - #;; - - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/watch.ex b/debian/watch similarity index 100% rename from debian/watch.ex rename to debian/watch diff --git a/debian/xcowsay-default.ex b/debian/xcowsay-default.ex deleted file mode 100644 index dd0ae1c..0000000 --- a/debian/xcowsay-default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for xcowsay initscript -# sourced by /etc/init.d/xcowsay -# installed at /etc/default/xcowsay by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/po/pt_BR.po b/po/pt_BR.po index b9fc0e1..3055e51 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2008-08-29 20:51+0100\n" +"POT-Creation-Date: 2008-08-30 10:33+0100\n" "PO-Revision-Date: 2008-05-23 22:57-0300\n" "Last-Translator: Phantom X \n" "Language-Team: Português do Brasil \n" @@ -92,7 +92,8 @@ msgstr "" "calculado do parâmetro reading_speed multiplicado pelo número de palavras." #: src/xcowsay.c:118 -msgid "Report bugs to nick@cakesniffer.co.uk" +#, fuzzy +msgid "Report bugs to nick@nickg.me.uk" msgstr "Reportar bugs para nick@cakesniffer.co.uk" #: src/xcowsay.c:144 diff --git a/po/xcowsay.pot b/po/xcowsay.pot index 98d547d..57c40ca 100644 --- a/po/xcowsay.pot +++ b/po/xcowsay.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xcowsay 1.1rc1\n" +"Project-Id-Version: xcowsay 1.1\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2008-08-29 20:51+0100\n" +"POT-Creation-Date: 2008-08-30 10:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,7 +86,7 @@ msgid "" msgstr "" #: src/xcowsay.c:118 -msgid "Report bugs to nick@cakesniffer.co.uk" +msgid "Report bugs to nick@nickg.me.uk" msgstr "" #: src/xcowsay.c:144 diff --git a/src/xcowsay.c b/src/xcowsay.c index 739495b..a7de1ad 100644 --- a/src/xcowsay.c +++ b/src/xcowsay.c @@ -115,7 +115,7 @@ static void usage() i18n("If the display_time option is not set the display time will " "be calcuated\nfrom the reading_speed parameter multiplied by " "the word count."), - i18n("Report bugs to nick@cakesniffer.co.uk") + i18n("Report bugs to nick@nickg.me.uk") ); } -- 2.39.2