From 5f921265844a452ef604dab05b1ed87dc5a1d79c Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sat, 21 Nov 2009 14:05:08 +0000 Subject: [PATCH] Update for 1.1 --- Makefile.am | 4 +- config.h.in | 3 ++ configure.ac | 4 +- debian/Makefile.am | 4 -- debian/changelog | 24 ---------- debian/compat | 1 - debian/control | 19 -------- debian/copyright | 33 -------------- debian/dirs | 2 - debian/docs | 2 - debian/files | 1 - debian/postinst.ex | 41 ----------------- debian/postrm.ex | 39 ---------------- debian/preinst.ex | 37 --------------- debian/prerm.ex | 40 ---------------- debian/rules | 99 ---------------------------------------- debian/watch | 22 --------- debian/xcowsay.substvars | 1 - po/pt_BR.po | 2 +- po/xcowsay.pot | 4 +- src/settings.c | 2 +- src/xcowsay.c | 4 +- 22 files changed, 13 insertions(+), 375 deletions(-) delete mode 100644 debian/Makefile.am delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/docs delete mode 100644 debian/files delete mode 100644 debian/postinst.ex delete mode 100644 debian/postrm.ex delete mode 100644 debian/preinst.ex delete mode 100644 debian/prerm.ex delete mode 100755 debian/rules delete mode 100644 debian/watch delete mode 100644 debian/xcowsay.substvars diff --git a/Makefile.am b/Makefile.am index 9745945..ed45be0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ -SUBDIRS = po debian src +SUBDIRS = po src dist_pkgdata_DATA = cow_small.png cow_med.png cow_large.png -EXTRA_DIST = config.rpath m4/ChangeLog cow.svg xcowsay.6 +EXTRA_DIST = config.rpath m4/ChangeLog cow.svg xcowsay.6 man_MANS = xcowsay.6 ACLOCAL_AMFLAGS = -I m4 diff --git a/config.h.in b/config.h.in index aa22417..943163d 100644 --- a/config.h.in +++ b/config.h.in @@ -77,6 +77,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/configure.ac b/configure.ac index a4a3a4d..d304738 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([xcowsay], [1.1], +AC_INIT([xcowsay], [1.1.1], [Nick Gasson ], [xcowsay]) AM_INIT_AUTOMAKE([-Wall]) @@ -35,4 +35,4 @@ AC_ARG_ENABLE(dbus, PKG_CHECK_MODULES(XCOWSAY, $modules) AC_CONFIG_HEADERS([config.h]) -AC_OUTPUT([Makefile debian/Makefile src/Makefile po/Makefile.in]) +AC_OUTPUT([Makefile src/Makefile po/Makefile.in]) diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index e406701..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = changelog docs postrm.ex \ - compat preinst.ex xcowsay.substvars \ - control prerm.ex copyright \ - rules dirs files postinst.ex watch diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 91b5dce..0000000 --- a/debian/changelog +++ /dev/null @@ -1,24 +0,0 @@ -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 - - -- Nick Gasson Fri, 29 Aug 2008 21:04:00 +0000 - -xcowsay (1.0) unstable; urgency=low - - * Finished xcowsay 1.0 - - -- Nick Gasson Fri, 23 May 2008 10:21:48 +0000 - -xcowsay (0.6-1) unstable; urgency=low - - * Initial release (Closes: #nnnn) - - -- Nick Gasson Sun, 16 Mar 2008 11:42:46 +0000 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 0881b9e..0000000 --- a/debian/control +++ /dev/null @@ -1,19 +0,0 @@ -Source: xcowsay -Section: games -Priority: optional -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}, 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. 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 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 deleted file mode 100644 index a27c0d8..0000000 --- a/debian/copyright +++ /dev/null @@ -1,33 +0,0 @@ -This package was debianized by Nick Gasson on -Sun, 16 Mar 2008 11:42:46 +0000. - -It was downloaded from: http://www.nickg.me.uk/files/xcowsay-0.6.tar.gz - -Upstream Author(s): - - Nick Gasson - -Copyright: - - - -License: - - 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 3 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, see . - - 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 -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bb..0000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 50bd824..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README diff --git a/debian/files b/debian/files deleted file mode 100644 index 6d5ecd6..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -xcowsay_0.6-1_amd64.deb games optional diff --git a/debian/postinst.ex b/debian/postinst.ex deleted file mode 100644 index a8bda5a..0000000 --- a/debian/postinst.ex +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# postinst script for xcowsay -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/postrm.ex b/debian/postrm.ex deleted file mode 100644 index d9271dd..0000000 --- a/debian/postrm.ex +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# postrm script for xcowsay -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/preinst.ex b/debian/preinst.ex deleted file mode 100644 index 8175b05..0000000 --- a/debian/preinst.ex +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# preinst script for xcowsay -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/prerm.ex b/debian/prerm.ex deleted file mode 100644 index 92c1c04..0000000 --- a/debian/prerm.ex +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# prerm script for xcowsay -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 6f572f1..0000000 --- a/debian/rules +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -config.status: configure - dh_testdir - # Add here commands to configure the package. -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/xcowsay.sgml > xcowsay.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -([ -f Makefile ] && $(MAKE) distclean) || true - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/xcowsay. - $(MAKE) DESTDIR=$(CURDIR)/debian/xcowsay install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1f370ab..0000000 --- a/debian/watch +++ /dev/null @@ -1,22 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php xcowsay-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -http://www.nickg.me.uk/files/xcowsay-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/xcowsay-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/xcowsay/xcowsay-(.*)\.tar\.gz - - diff --git a/debian/xcowsay.substvars b/debian/xcowsay.substvars deleted file mode 100644 index cd58858..0000000 --- a/debian/xcowsay.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libdbus-glib-1-2 (>= 0.74), libatk1.0-0 (>= 1.20.0), libpango1.0-0 (>= 1.18.4), libdbus-1-3 (>= 1.1.1), libgtk2.0-0 (>= 2.12.0), libc6 (>= 2.7-1), libglib2.0-0 (>= 2.14.0), libcairo2 (>=1.4.0) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3a5caf0..d05ce1d 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-30 10:33+0100\n" +"POT-Creation-Date: 2009-10-21 20:06+0100\n" "PO-Revision-Date: 2008-08-30 16:39-0300\n" "Last-Translator: Phantom X \n" "Language-Team: Português do Brasil \n" diff --git a/po/xcowsay.pot b/po/xcowsay.pot index 57c40ca..24d01c1 100644 --- a/po/xcowsay.pot +++ b/po/xcowsay.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xcowsay 1.1\n" +"Project-Id-Version: xcowsay 1.1.1\n" "Report-Msgid-Bugs-To: nick@cakesniffer.co.uk\n" -"POT-Creation-Date: 2008-08-30 10:33+0100\n" +"POT-Creation-Date: 2009-10-21 20:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/settings.c b/src/settings.c index 337eafd..ed56b47 100644 --- a/src/settings.c +++ b/src/settings.c @@ -58,7 +58,7 @@ static option_t *get_option(const char *name) if (strcmp(name, it->opt.name) == 0) return &it->opt; } - fprintf(stderr, "Internal Error: Invalid option '%s'\n", name); + fprintf(stderr, "Invalid option '%s'\n", name); exit(EXIT_FAILURE); } diff --git a/src/xcowsay.c b/src/xcowsay.c index 3b2f2bc..a3c5151 100644 --- a/src/xcowsay.c +++ b/src/xcowsay.c @@ -1,5 +1,5 @@ /* xcowsay.c -- Cute talking cow for GTK+. - * Copyright (C) 2008 Nick Gasson + * Copyright (C) 2008-2009 Nick Gasson * * 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 @@ -122,7 +122,7 @@ static void usage() static void version() { static const char *copy = - "Copyright (C) 2008 Nick Gasson\n" + "Copyright (C) 2008-2009 Nick Gasson\n" "This program comes with ABSOLUTELY NO WARRANTY. This is free software, and\n" "you are welcome to redistribute it under certain conditions. See the GNU\n" "General Public Licence for details."; -- 2.39.2