--- gtkpool-0.5.0.orig/debian/rules +++ gtkpool-0.5.0/debian/rules @@ -0,0 +1,63 @@ +#!/usr/bin/make -f +# Derived from the debhelper example rules file. + +#export DH_VERBOSE=1 + +PACKAGE=gtkpool + +include /usr/share/quilt/quilt.make + +arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +CFLAGS := -g -Wall +ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" "" +CFLAGS += -O0 +else +CFLAGS += -O2 +endif +ifeq "$(arch)" "alpha" +CFLAGS += -mieee +endif + +build: patch config.status gtkpool/gtkpool + +config.status: configure +# auto* calls are temporary, although, upstream seems a bit dead + autoreconf --install + CXXFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc \ + --mandir='$${prefix}/share/man' + +gtkpool/gtkpool: + dh_testdir + $(MAKE) CFLAGS="$(CFLAGS)" + +clean: unpatch + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + rm -rf admin Makefile.dist configure.in.in subdirs acinclude.m4 stamp-h.in + dh_clean stamp-build + +binary-indep: +# No architecture-independent packages here. + +binary-arch: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs usr/games usr/lib/gtkpool + $(MAKE) install bindir='$${prefix}/games' DESTDIR=$(CURDIR)/debian/gtkpool + dh_installdocs README TODO + dh_installman debian/gtkpool.6 + dh_installchangelogs ChangeLog + dh_installmenu + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- gtkpool-0.5.0.orig/debian/control +++ gtkpool-0.5.0/debian/control @@ -0,0 +1,14 @@ +Source: gtkpool +Section: games +Priority: optional +Maintainer: Josip Rodin +Build-Depends: debhelper (>= 5), quilt, libgtk2.0-dev, automake, autoconf +Standards-Version: 3.8.3 + +Package: gtkpool +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: simple pool billiard game written with GTK+ + GtkPool brings you that classic favourite game of lounge lizards. + It has a rather simple playing interface and it supports a really + nifty, customizable physics system. --- gtkpool-0.5.0.orig/debian/README.source +++ gtkpool-0.5.0/debian/README.source @@ -0,0 +1,11 @@ +gtkpool for Debian +------------------ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + + /usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. --- gtkpool-0.5.0.orig/debian/menu +++ gtkpool-0.5.0/debian/menu @@ -0,0 +1,2 @@ +?package(gtkpool): needs="X11" section="Games/Simulation" \ + title="GTKPool" command="/usr/games/gtkpool" --- gtkpool-0.5.0.orig/debian/compat +++ gtkpool-0.5.0/debian/compat @@ -0,0 +1 @@ +5 --- gtkpool-0.5.0.orig/debian/changelog +++ gtkpool-0.5.0/debian/changelog @@ -0,0 +1,137 @@ +gtkpool (0.5.0-9) unstable; urgency=low + + * Added Barry deFreese's patch for GTK+ 2.0 support, closes: #515318. + This adds a bunch of excess dependencies that dpkg-shlibdeps complains + about, but it's a lesser evil. + * Switched from dpatch to quilt. + * To avoid carrying a huge chunk of auto*-generated crap, just run + autoreconf before build and add the build-depends, because + the build system needs a real kicking. + * Moved all other patches into debian/patches/. + * Disabled the gettext/po build system fixes because they're not essential + as much of the program is not gettextized, nor is any of it translated, + so they just complicate the build for no real gain. Right now they + are also likely broken because of missing config.rpath and/or excess + patching of files that gettextize would provide. + * Added a lintian override for one warning about admin/ - we kill it + during build. Not adding dh_lintian calls, it's source-only. + * Updated standards version to 3.8.3. Added quilt README.source. + + -- Josip Rodin Wed, 11 Nov 2009 14:23:30 +0100 + +gtkpool (0.5.0-8+b1) unstable; urgency=low + + * Binary-only NMU on amd64 - transition to libglib1.2ldbl. + + -- Josip Rodin Sat, 22 Mar 2008 15:30:04 +0100 + +gtkpool (0.5.0-8) unstable; urgency=low + + * Fixed build failure with g++ 4.3, a missing #include , + closes: #461707 [fix_FTBFS_gcc-4.3.dpatch] + + -- Josip Rodin Mon, 3 Mar 2008 21:35:14 +0100 + +gtkpool (0.5.0-7) unstable; urgency=low + + * Took my package back, thank you, closes: #327627. :) + * Bumped standards-version to 3.7.2, and DH_COMPAT to 5. + + -- Josip Rodin Fri, 22 Sep 2006 18:53:17 +0200 + +gtkpool (0.5.0-6) unstable; urgency=low + + * QA Group upload orphaning this package + * debian/control: Build-Depend on dpatch + * debian/rules: add dpatch support + * Added patch from Andreas Jochens to fix FTBFS with gcc-3.4 + * debian/copyright: updated address of the FSF + * debian/menu: quoted the unquoted + * Updated config.{sub,guess} + * debian/rules: bumped debhelper compatibility level to 3 + + -- Andrew Pollock Thu, 6 Oct 2005 21:39:49 +1000 + +gtkpool (0.5.0-5) unstable; urgency=low + + * Fixed CXXFLAGS propagation and set up gettextization properly in the + build system. + + -- Josip Rodin Sun, 8 Jun 2003 21:30:24 +0200 + +gtkpool (0.5.0-4) unstable; urgency=low + + * Ripped out the whole (kdevelop-induced?) fuckage. This purely + coincidentally removes the whole of libtool, so the outdated + version of the latter can no longer kill the Hurd, closes: #141336. + * Removed an extra preprocessor inclusion that caused gcc 3.3 to + die on gtkpool, thanks to Jakob Hilmer, closes: #196405. + + -- Josip Rodin Sun, 8 Jun 2003 18:27:09 +0200 + +gtkpool (0.5.0-3) unstable; urgency=low + + * Hmm. Hacked AM_MAINTAINER_MODE into the configure.in file, somehow, + hopefully it will stop re-running aclocal and such all the time now, + and not disappear either, closes: #178890. + + -- Josip Rodin Wed, 29 Jan 2003 14:42:21 +0100 + +gtkpool (0.5.0-2) unstable; urgency=low + + * A few updates in the packaging, new maintainer address. + + -- Josip Rodin Tue, 28 Jan 2003 15:33:42 +0100 + +gtkpool (0.5.0-1) unstable; urgency=low + + * New upstream version, kinda. + * Included the GCC 3.2 patch from Jeroen T. Vermeulen, closes: #158550. + + -- Josip Rodin Sat, 31 Aug 2002 00:14:11 +0200 + +gtkpool (0.4.99-1) unstable; urgency=low + + * Pre-release 0.5.0, helping the author see if it builds on different + compilers and architectures. + + -- Josip Rodin Thu, 8 Aug 2002 22:13:45 +0200 + +gtkpool (0.4.1-1) unstable; urgency=low + + * New upstream version. + * Added GCC 3.0 patches kindly provided by Philip Martin + , merely adjusted for the new version, + closes: #104849. + + -- Josip Rodin Thu, 14 Feb 2002 19:47:16 +0100 + +gtkpool (0.3.4-4) unstable; urgency=low + + * New maintainer. + * General cleanup. Policy 3.5.5 compliance. + * Really fixed #97723 by passing "-mieee" in the CFLAGS on Alpha. + + -- Josip Rodin Sat, 9 Jun 2001 21:48:00 +0200 + +gtkpool (0.3.4-3) unstable; urgency=low + + * Fixed core dump on alpha by compiling with -mieee flag; closes: #97723 + + -- Dr. Guenter Bechly Wed, 16 May 2001 22:37:55 +0200 + +gtkpool (0.3.4-2) unstable; urgency=low + + * Corrected typo in copyright file. + * Removed call of deprecated dh_testversion in rules to fix lintian + warning. + + -- Dr. Guenter Bechly Thu, 29 Mar 2001 12:04:20 +0200 + +gtkpool (0.3.4-1) unstable; urgency=low + + * Initial Release; closes: #88454. + * Wrote a manpage. + * Modified path in myconfig.hh. + + -- Dr. Guenter Bechly Sun, 4 Mar 2001 11:04:34 +0100 --- gtkpool-0.5.0.orig/debian/source.lintian-overrides +++ gtkpool-0.5.0/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +# upstream clutter, we rm -rf admin before build +gtkpool source: ancient-libtool admin/ltconfig --- gtkpool-0.5.0.orig/debian/gtkpool.6 +++ gtkpool-0.5.0/debian/gtkpool.6 @@ -0,0 +1,20 @@ +.TH GTKPOOL 6 "March 2001" "Debian GNU/Linux" "gtkpool" +.SH NAME +gtkpool \- simple GTK+ pool billiard game +.SH SYNOPSIS +.B gtkpool +.SH DESCRIPTION +This manual page briefly documents the \fBgtkpool\fP command. +It was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +\fBgtkpool\fP brings that classic favourite of lounge lizards to a +Linux box near you. It currently has a rather simple playing interface, +but supports a really nifty customizable physics system. +.SH OPTIONS +There are no options. Just start the game under X by running \fIgtkpool\fP. +.SH AUTHOR +Gtkpool was written by Jacques Fortier . +.PP +This manual page was written by Dr. Guenter Bechly , +for the Debian GNU/Linux system (but may be used by others). --- gtkpool-0.5.0.orig/debian/copyright +++ gtkpool-0.5.0/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Dr. Guenter Bechly on +Sun, 4 Mar 2001 11:04:34 +0100. + +The package is currently maintained by Josip Rodin . + +Original sources can be found at: http://gtkpool.seul.org/ + +Upstream maintainer: Brian Ashe + +Copyright (C) 1999-2002 by Jacques Fortier & Brian Ashe + + 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. + +On Debian systems, the complete text of the GNU General Public Licence +can be found in the `/usr/share/common-licenses/GPL' file. --- gtkpool-0.5.0.orig/debian/patches/build.system.basic +++ gtkpool-0.5.0/debian/patches/build.system.basic @@ -0,0 +1,435 @@ +--- gtkpool-0.5.0.orig/Makefile.am 2009-11-11 15:12:03.000000000 +0100 ++++ gtkpool-0.5.0/Makefile.am 2009-11-11 15:12:30.000000000 +0100 +@@ -1,30 +1,7 @@ +-####### kdevelop will overwrite this part!!! (begin)########## +- + SUBDIRS = gtkpool + +-EXTRA_DIST = gtkpool.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO gtkpool.lsm gtkpool.spec ++EXTRA_DIST = config.rpath gtkpool.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO gtkpool.lsm gtkpool.spec + +-####### kdevelop will overwrite this part!!! (end)############ +-# not a GNU package. You can remove this line, if +-# have all needed files, that a GNU package needs + AUTOMAKE_OPTIONS = foreign + +-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs +- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ; +- +-$(top_srcdir)/subdirs: +- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs +- +-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in +- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4 +- +-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files +- +-package-messages: +- $(MAKE) -f admin/Makefile.common package-messages +- +-dist-hook: +- cd $(top_distdir) && perl admin/am_edit -padmin +- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs +- +- ++CXXFLAGS = +--- gtkpool-0.5.0.orig/gtkpool/Makefile.am ++++ gtkpool-0.5.0/gtkpool/Makefile.am +@@ -1,4 +1,3 @@ +-####### kdevelop will overwrite this part!!! (begin)########## + bin_PROGRAMS = gtkpool + gtkpool_SOURCES = moving.cpp game.cpp indentify_ball.cpp support.cpp ball.cpp circle.cpp point2d.cpp vec2d.cpp options.cpp sound.cpp check_pocket.cpp pointer_selects.cpp draw_ball.cpp apply_friction.cpp move_balls.cpp check_table_collision.cpp connectdialog.cpp application.cpp main.cpp + gtkpool_LDADD = +@@ -8,16 +7,12 @@ + EXTRA_DIST = main.cpp application.cpp application.h connectdialog.cpp connectdialog.h check_table_collision.cpp check_table_collision.h move_balls.cpp move_balls.h apply_friction.cpp apply_friction.h draw_ball.cpp draw_ball.h pointer_selects.cpp pointer_selects.h check_pocket.cpp check_pocket.h sound.cpp sound.h options.h options.cpp vec2d.cpp vec2d.h point2d.cpp point2d.h circle.cpp circle.h ball.cpp ball.h support.h support.cpp pixmaps indentify_ball.cpp indentify_ball.h game.cpp game.h moving.h moving.cpp lo32-app-gtkpool.png + + install-data-local: +- $(mkinstalldirs) ${datadir}/icons/ +- $(INSTALL_DATA) $(srcdir)/lo32-app-gtkpool.png ${datadir}/icons/gtkpool.png ++ $(mkinstalldirs) ${DESTDIR}${datadir}/icons/ ++ $(INSTALL_DATA) $(srcdir)/lo32-app-gtkpool.png ${DESTDIR}${datadir}/icons/gtkpool.png + + uninstall-local: +- -rm -f ${datadir}/icons/gtkpool.png ++ rm -f ${datadir}/icons/gtkpool.png + +-####### kdevelop will overwrite this part!!! (end)############ +-# set the include path found by configure +-INCLUDES= $(all_includes) +- +-# the library search path. +-gtkpool_LDFLAGS = $(all_libraries) +- ++CXXFLAGS += @GTK_CFLAGS@ ++ ++gtkpool_LDADD += @GTK_LIBS@ +--- gtkpool-0.5.0.orig/gtkpool/pixmaps/Makefile.am ++++ gtkpool-0.5.0/gtkpool/pixmaps/Makefile.am +@@ -1,136 +1,132 @@ +-####### kdevelop will overwrite this part!!! (begin)########## +- + + EXTRA_DIST = ball-shadow.xpm ball_10_lg.xpm ball_10_sm.xpm ball_11_lg.xpm ball_11_sm.xpm ball_12_lg.xpm ball_12_sm.xpm ball_13_lg.xpm ball_13_sm.xpm ball_14_lg.xpm ball_14_sm.xpm ball_15_lg.xpm ball_15_sm.xpm ball_1_lg.xpm ball_1_sm.xpm ball_2_lg.xpm ball_2_sm.xpm ball_3_lg.xpm ball_3_sm.xpm ball_4_lg.xpm ball_4_sm.xpm ball_5_lg.xpm ball_5_sm.xpm ball_6_lg.xpm ball_6_sm.xpm ball_7_lg.xpm ball_7_sm.xpm ball_8_lg.xpm ball_8_sm.xpm ball_9_lg.xpm ball_9_sm.xpm ball_cue_lg.xpm ball_cue_sm.xpm bllq-icon.xpm blpl-icon.xpm mabl-icon.xpm maho-icon.xpm pool_table_black-laquer.xpm pool_table_black-pearl.xpm pool_table_mahogany.xpm pool_table_maple-burl.xpm ball_drop.raw ball_hit.raw + + install-data-local: +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_10_lg.xpm ${datadir}/gtkpool/ball_10_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_10_sm.xpm ${datadir}/gtkpool/ball_10_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_11_lg.xpm ${datadir}/gtkpool/ball_11_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_11_sm.xpm ${datadir}/gtkpool/ball_11_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_12_lg.xpm ${datadir}/gtkpool/ball_12_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_12_sm.xpm ${datadir}/gtkpool/ball_12_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_13_lg.xpm ${datadir}/gtkpool/ball_13_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_13_sm.xpm ${datadir}/gtkpool/ball_13_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_14_lg.xpm ${datadir}/gtkpool/ball_14_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_14_sm.xpm ${datadir}/gtkpool/ball_14_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_15_lg.xpm ${datadir}/gtkpool/ball_15_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_15_sm.xpm ${datadir}/gtkpool/ball_15_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_1_lg.xpm ${datadir}/gtkpool/ball_1_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_1_sm.xpm ${datadir}/gtkpool/ball_1_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_2_lg.xpm ${datadir}/gtkpool/ball_2_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_2_sm.xpm ${datadir}/gtkpool/ball_2_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_3_lg.xpm ${datadir}/gtkpool/ball_3_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_3_sm.xpm ${datadir}/gtkpool/ball_3_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_4_lg.xpm ${datadir}/gtkpool/ball_4_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_4_sm.xpm ${datadir}/gtkpool/ball_4_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_5_lg.xpm ${datadir}/gtkpool/ball_5_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_5_sm.xpm ${datadir}/gtkpool/ball_5_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_6_lg.xpm ${datadir}/gtkpool/ball_6_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_6_sm.xpm ${datadir}/gtkpool/ball_6_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_7_lg.xpm ${datadir}/gtkpool/ball_7_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_7_sm.xpm ${datadir}/gtkpool/ball_7_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_8_lg.xpm ${datadir}/gtkpool/ball_8_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_8_sm.xpm ${datadir}/gtkpool/ball_8_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_9_lg.xpm ${datadir}/gtkpool/ball_9_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_9_sm.xpm ${datadir}/gtkpool/ball_9_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_cue_lg.xpm ${datadir}/gtkpool/ball_cue_lg.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_cue_sm.xpm ${datadir}/gtkpool/ball_cue_sm.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/bllq-icon.xpm ${datadir}/gtkpool/bllq-icon.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/blpl-icon.xpm ${datadir}/gtkpool/blpl-icon.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/mabl-icon.xpm ${datadir}/gtkpool/mabl-icon.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/maho-icon.xpm ${datadir}/gtkpool/maho-icon.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/pool_table_black-laquer.xpm ${datadir}/gtkpool/pool_table_black-laquer.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/pool_table_black-pearl.xpm ${datadir}/gtkpool/pool_table_black-pearl.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/pool_table_mahogany.xpm ${datadir}/gtkpool/pool_table_mahogany.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/pool_table_maple-burl.xpm ${datadir}/gtkpool/pool_table_maple-burl.xpm +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_drop.raw ${datadir}/gtkpool/ball_drop.raw +- $(mkinstalldirs) ${datadir}/gtkpool/ +- $(INSTALL_DATA) $(srcdir)/ball_hit.raw ${datadir}/gtkpool/ball_hit.raw ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_10_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_10_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_10_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_10_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_11_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_11_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_11_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_11_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_12_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_12_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_12_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_12_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_13_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_13_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_13_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_13_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_14_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_14_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_14_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_14_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_15_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_15_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_15_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_15_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_1_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_1_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_1_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_1_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_2_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_2_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_2_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_2_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_3_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_3_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_3_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_3_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_4_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_4_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_4_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_4_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_5_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_5_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_5_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_5_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_6_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_6_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_6_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_6_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_7_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_7_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_7_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_7_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_8_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_8_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_8_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_8_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_9_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_9_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_9_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_9_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_cue_lg.xpm ${DESTDIR}${datadir}/gtkpool/ball_cue_lg.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_cue_sm.xpm ${DESTDIR}${datadir}/gtkpool/ball_cue_sm.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/bllq-icon.xpm ${DESTDIR}${datadir}/gtkpool/bllq-icon.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/blpl-icon.xpm ${DESTDIR}${datadir}/gtkpool/blpl-icon.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/mabl-icon.xpm ${DESTDIR}${datadir}/gtkpool/mabl-icon.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/maho-icon.xpm ${DESTDIR}${datadir}/gtkpool/maho-icon.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/pool_table_black-laquer.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_black-laquer.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/pool_table_black-pearl.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_black-pearl.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/pool_table_mahogany.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_mahogany.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/pool_table_maple-burl.xpm ${DESTDIR}${datadir}/gtkpool/pool_table_maple-burl.xpm ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_drop.raw ${DESTDIR}${datadir}/gtkpool/ball_drop.raw ++ $(mkinstalldirs) ${DESTDIR}${datadir}/gtkpool/ ++ $(INSTALL_DATA) $(srcdir)/ball_hit.raw ${DESTDIR}${datadir}/gtkpool/ball_hit.raw + + uninstall-local: +- -rm -f ${datadir}/gtkpool/ball_10_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_10_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_11_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_11_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_12_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_12_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_13_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_13_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_14_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_14_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_15_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_15_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_1_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_1_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_2_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_2_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_3_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_3_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_4_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_4_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_5_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_5_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_6_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_6_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_7_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_7_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_8_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_8_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_9_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_9_sm.xpm +- -rm -f ${datadir}/gtkpool/ball_cue_lg.xpm +- -rm -f ${datadir}/gtkpool/ball_cue_sm.xpm +- -rm -f ${datadir}/gtkpool/bllq-icon.xpm +- -rm -f ${datadir}/gtkpool/blpl-icon.xpm +- -rm -f ${datadir}/gtkpool/mabl-icon.xpm +- -rm -f ${datadir}/gtkpool/maho-icon.xpm +- -rm -f ${datadir}/gtkpool/pool_table_black-laquer.xpm +- -rm -f ${datadir}/gtkpool/pool_table_black-pearl.xpm +- -rm -f ${datadir}/gtkpool/pool_table_mahogany.xpm +- -rm -f ${datadir}/gtkpool/pool_table_maple-burl.xpm +- -rm -f ${datadir}/gtkpool/ball_drop.raw +- -rm -f ${datadir}/gtkpool/ball_hit.raw +- +-####### kdevelop will overwrite this part!!! (end)############ ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_10_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_10_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_11_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_11_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_12_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_12_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_13_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_13_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_14_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_14_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_15_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_15_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_1_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_1_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_2_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_2_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_3_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_3_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_4_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_4_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_5_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_5_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_6_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_6_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_7_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_7_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_8_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_8_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_9_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_9_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_cue_lg.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_cue_sm.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/bllq-icon.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/blpl-icon.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/mabl-icon.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/maho-icon.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_black-laquer.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_black-pearl.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_mahogany.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/pool_table_maple-burl.xpm ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_drop.raw ++ -rm -f ${DESTDIR}${datadir}/gtkpool/ball_hit.raw +--- gtkpool-0.5.0.orig/configure.in 2009-11-11 15:25:46.000000000 +0100 ++++ gtkpool-0.5.0/configure.in 2009-11-11 15:26:05.000000000 +0100 +@@ -1,95 +1,12 @@ +-dnl This file is part of the KDE libraries/packages +-dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org) +-dnl modified by Walter Tasin (tasin@kdevelop.org) +-dnl for c++ console applications +- +-dnl This file is free software; you can redistribute it and/or +-dnl modify it under the terms of the GNU Library General Public +-dnl License as published by the Free Software Foundation; either +-dnl version 2 of the License, or (at your option) any later version. +- +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Library General Public License for more details. +- +-dnl You should have received a copy of the GNU Library General Public License +-dnl along with this library; see the file COPYING.LIB. If not, write to +-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-dnl Boston, MA 02111-1307, USA. +- +-# Original Author was Kalle@kde.org +-# I lifted it in some mater. (Stephan Kulow) +-# I used much code from Janos Farkas +- +-dnl Process this file with autoconf to produce a configure script. +- +-AC_INIT(acinclude.m4) dnl a source file from your sub dir +- +-dnl This is so we can use kde-common +-AC_CONFIG_AUX_DIR(admin) +- +-dnl This ksh/zsh feature conflicts with `cd blah ; pwd` +-unset CDPATH +- +-dnl Checking host/target/build systems, for make, install etc. +-AC_CANONICAL_SYSTEM +-dnl Perform program name transformation +-AC_ARG_PROGRAM +- +-dnl Automake doc recommends to do this only here. (Janos) +-AM_INIT_AUTOMAKE(gtkpool, 0.5.0) dnl searches for some needed programs +- +-dnl almost the same like KDE_SET_PEFIX but the path is /usr/local +-dnl +-unset CDPATH +-dnl make /usr/local the default for the installation ++AC_INIT(gtkpool/main.cpp) ++AM_INIT_AUTOMAKE(gtkpool, 0.5.0) ++AM_MAINTAINER_MODE + AC_PREFIX_DEFAULT(/usr/local) +- +-if test "x$prefix" = "xNONE"; then +- prefix=$ac_default_prefix +- ac_configure_args="$ac_configure_args --prefix $prefix" +-fi +-KDE_FAST_CONFIGURE +-KDE_CONF_FILES +- +-dnl without this order in this file, automake will be confused! +-dnl ++AC_PROG_CXX ++AC_PROG_CPP ++AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK+ version less than 1.2!)) + AM_CONFIG_HEADER(config.h) +- +-dnl checks for programs. +-dnl first check for c/c++ compilers +-AC_CHECK_COMPILERS +-dnl CXXFLAGS="-DHAVE_CONFIG_H -I. -I.. -O2 -O0 -g3 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11 $USE_EXCEPTIONS" +-CXXFLAGS="-DHAVE_CONFIG_H -I. -I.. -O2 -O0 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11 $USE_EXCEPTIONS" +- +-dnl create only shared libtool-libraries +-AC_ENABLE_SHARED(yes) +- +-dnl set the following to yes, if you want to create static +-dnl libtool-libraries, too. +-AC_ENABLE_STATIC(no) +- +-dnl create a working libtool-script +-KDE_PROG_LIBTOOL +- +-dnl activate the next macro call for DLOPEN tests and setting LIBDL +-dnl (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one) +-KDE_CHECK_DLOPEN +- +-dnl activate the next macro call for some additional tests +-dnl (compat, crypt, socket, nsl, dlopen, ...) +-dnl KDE_MISC_TESTS +- +-KDE_CHECK_EXTRA_LIBS +-all_libraries="$all_libraries $USER_LDFLAGS" +-all_includes="$all_includes $USER_INCLUDES" +-AC_SUBST(all_includes) +-AC_SUBST(all_libraries) +- +-AC_SUBST(AUTODIRS) +- +-KDE_CREATE_SUBDIRSLIST ++AC_SUBST(CXXFLAGS) + AC_OUTPUT( \ + ./Makefile \ + gtkpool/Makefile \ --- gtkpool-0.5.0.orig/debian/patches/fix_FTBFS_gcc-4.3 +++ gtkpool-0.5.0/debian/patches/fix_FTBFS_gcc-4.3 @@ -0,0 +1,10 @@ +--- gtkpool-0.5.0/gtkpool/game.h 2008-03-03 21:32:57.000000000 +0100 ++++ gtkpool-0.5.0/gtkpool/game.h 2008-03-03 21:32:57.000000000 +0100 +@@ -19,6 +19,7 @@ + #define GAME_H + #include + #include ++#include + + /** + *@author Brian Ashe --- gtkpool-0.5.0.orig/debian/patches/gtk2.support +++ gtkpool-0.5.0/debian/patches/gtk2.support @@ -0,0 +1,66 @@ +--- gtkpool-0.5.0/gtkpool/application.cpp ++++ gtkpool-0.5.0/gtkpool/application.cpp +@@ -819,8 +819,14 @@ + { ++ GtkTextBuffer *chat_textbuf; ++ GtkTextIter chat_textiter; ++ + if (colour > 4) + colour = 14; + if (colour < 0) + colour = 14; +- gtk_text_insert(GTK_TEXT(chat_text), NULL, message_colours[colour], NULL, "\n", -1); +- gtk_text_insert(GTK_TEXT(chat_text), NULL, message_colours[colour], NULL, message, -1); ++ ++ chat_textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(chat_text)); ++ gtk_text_buffer_get_iter_at_offset(chat_textbuf, &chat_textiter, 0); ++ gtk_text_buffer_insert(chat_textbuf, &chat_textiter, "\n", -1); ++ gtk_text_buffer_insert(chat_textbuf, &chat_textiter, message, -1); + } +--- gtkpool-0.5.0/gtkpool/Makefile.am ++++ gtkpool-0.5.0/gtkpool/Makefile.am +@@ -14,5 +14,5 @@ + rm -f ${datadir}/icons/gtkpool.png + +-CXXFLAGS += @GTK_CFLAGS@ ++AM_CXXFLAGS = @GTK_CFLAGS@ + + gtkpool_LDADD += @GTK_LIBS@ +--- gtkpool-0.5.0/configure.in ++++ gtkpool-0.5.0/configure.in +@@ -4,7 +4,7 @@ + AC_PREFIX_DEFAULT(/usr/local) + AC_PROG_CXX + AC_PROG_CPP +-AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK+ version less than 1.2!)) ++AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(GTK+ version less than 2.0!)) + AM_CONFIG_HEADER(config.h) + AC_SUBST(CXXFLAGS) + AC_OUTPUT( \ +--- gtkpool-0.5.0/gtkpool/main.cpp ++++ gtkpool-0.5.0/gtkpool/main.cpp +@@ -162,10 +162,10 @@ + gtk_widget_show(button);*/ + + //setup chat box for multiplayer +- app.chat_text = gtk_text_new((GtkAdjustment *)NULL, (GtkAdjustment *)NULL); ++ app.chat_text = gtk_text_view_new(); + gtk_widget_set_usize(app.chat_text, -2, 60); +- gtk_text_set_editable(GTK_TEXT(app.chat_text), FALSE); +- gtk_text_set_word_wrap(GTK_TEXT(app.chat_text), TRUE); ++ gtk_text_view_set_editable(GTK_TEXT_VIEW(app.chat_text), FALSE); ++ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(app.chat_text), GTK_WRAP_WORD); + gtk_widget_set_events (app.chat_text, GDK_NOTHING); + // networking not ready for this version + +--- gtkpool-0.5.0/gtkpool/options.cpp ++++ gtkpool-0.5.0/gtkpool/options.cpp +@@ -68,7 +68,7 @@ + opt_dlg = gtk_dialog_new (); + gtk_object_set_data (GTK_OBJECT (opt_dlg), "opt_dlg", opt_dlg); + gtk_window_set_title (GTK_WINDOW (opt_dlg), _("GTKPool Options")); +- GTK_WINDOW (opt_dlg)->type = GTK_WINDOW_DIALOG; ++ GTK_WINDOW (opt_dlg)->type = GTK_WINDOW_TOPLEVEL; + gtk_window_set_position (GTK_WINDOW (opt_dlg), GTK_WIN_POS_CENTER); + gtk_window_set_policy (GTK_WINDOW (opt_dlg), FALSE, TRUE, FALSE); + gtk_widget_ref (opt_dlg); --- gtkpool-0.5.0.orig/debian/patches/series +++ gtkpool-0.5.0/debian/patches/series @@ -0,0 +1,6 @@ +build.system.basic +fix_FTBFS_gcc-3.2 +fix_FTBFS_gcc-3.3 +fix_FTBFS_gcc-3.4 +fix_FTBFS_gcc-4.3 +gtk2.support --- gtkpool-0.5.0.orig/debian/patches/fix_FTBFS_gcc-3.3 +++ gtkpool-0.5.0/debian/patches/fix_FTBFS_gcc-3.3 @@ -0,0 +1,10 @@ +--- gtkpool-0.5.0.orig/gtkpool/check_pocket.h ++++ gtkpool-0.5.0/gtkpool/check_pocket.h +@@ -17,7 +17,6 @@ + + #ifndef CHECK_POCKET_H + #define CHECK_POCKET_H +-#include "ball.h" + #include "game.h" + + --- gtkpool-0.5.0.orig/debian/patches/build.system.po +++ gtkpool-0.5.0/debian/patches/build.system.po @@ -0,0 +1,688 @@ +--- gtkpool-0.5.0.orig/configure.in ++++ gtkpool-0.5.0/configure.in +@@ -5,6 +5,7 @@ + AC_PROG_CXX + AC_PROG_CPP + AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK+ version less than 1.2!)) ++AM_GNU_GETTEXT([external]) + AM_CONFIG_HEADER(config.h) + AC_SUBST(CXXFLAGS) + AC_OUTPUT(\ +@@ -13,4 +14,5 @@ + gtkpool/docs/Makefile \ + gtkpool/docs/en/Makefile \ + gtkpool/pixmaps/Makefile \ ++po/Makefile.in \ + ) +--- gtkpool-0.5.0.orig/Makefile.am ++++ gtkpool-0.5.0/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = gtkpool ++SUBDIRS = gtkpool po + + EXTRA_DIST = config.rpath gtkpool.kdevprj AUTHORS COPYING ChangeLog INSTALL README TODO gtkpool.lsm gtkpool.spec + +--- gtkpool-0.5.0.orig/po/gtkpool.pot ++++ gtkpool-0.5.0/po/gtkpool.pot +@@ -0,0 +1,110 @@ ++# GTKPool -- simple pool billiard game written with GTK+ ++# Copyright (C) 1999-2002 Jacques Fortier and Brian Ashe ++# This file is distributed under the same license as the gtkpool package. ++# Brian Ashe , 2003. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: gtkpool 0.5.0\n" ++"POT-Creation-Date: 2003-06-08 21:24+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" ++ ++#: gtkpool/options.cpp:70 ++msgid "GTKPool Options" ++msgstr "" ++ ++#: gtkpool/options.cpp:92 ++msgid "Physics" ++msgstr "" ++ ++#: gtkpool/options.cpp:109 ++msgid "Collision Drag" ++msgstr "" ++ ++#: gtkpool/options.cpp:119 ++msgid "Bumper Drag" ++msgstr "" ++ ++#: gtkpool/options.cpp:129 ++msgid "Friction" ++msgstr "" ++ ++#: gtkpool/options.cpp:173 ++msgid "Table" ++msgstr "" ++ ++#: gtkpool/options.cpp:189 ++msgid "Black Pearl" ++msgstr "" ++ ++#: gtkpool/options.cpp:201 ++msgid "Black Laquer" ++msgstr "" ++ ++#: gtkpool/options.cpp:213 ++msgid "Maple Burl" ++msgstr "" ++ ++#: gtkpool/options.cpp:225 ++msgid "Mahogany" ++msgstr "" ++ ++#: gtkpool/options.cpp:275 ++msgid "Game" ++msgstr "" ++ ++#: gtkpool/options.cpp:292 ++msgid "8 - Ball" ++msgstr "" ++ ++#: gtkpool/options.cpp:303 ++msgid "9 - Ball" ++msgstr "" ++ ++#: gtkpool/options.cpp:314 ++msgid "Rotation" ++msgstr "" ++ ++#: gtkpool/options.cpp:325 ++msgid "No Rules" ++msgstr "" ++ ++#: gtkpool/options.cpp:336 ++msgid "Other" ++msgstr "" ++ ++#: gtkpool/options.cpp:353 ++msgid "No Sound" ++msgstr "" ++ ++#: gtkpool/options.cpp:363 ++msgid "No Aiming line" ++msgstr "" ++ ++#: gtkpool/options.cpp:373 ++msgid "Superhuman Shots" ++msgstr "" ++ ++#: gtkpool/options.cpp:383 ++msgid "Can Hit Moving Balls" ++msgstr "" ++ ++#: gtkpool/options.cpp:398 ++msgid "Close" ++msgstr "" ++ ++#: gtkpool/support.cpp:121 ++#, c-format ++msgid "Couldn't find pixmap file: %s" ++msgstr "" ++ ++#: gtkpool/support.cpp:130 ++#, c-format ++msgid "Error loading pixmap file: %s" ++msgstr "" +--- gtkpool-0.5.0.orig/po/Makevars.template ++++ gtkpool-0.5.0/po/Makevars.template +@@ -0,0 +1,25 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = Free Software Foundation, Inc. ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = +--- gtkpool-0.5.0.orig/po/remove-potcdate.sin ++++ gtkpool-0.5.0/po/remove-potcdate.sin +@@ -0,0 +1,19 @@ ++# Sed script that remove the POT-Creation-Date line in the header entry ++# from a POT file. ++# ++# The distinction between the first and the following occurrences of the ++# pattern is achieved by looking at the hold space. ++/^"POT-Creation-Date: .*"$/{ ++x ++# Test if the hold space is empty. ++s/P/P/ ++ta ++# Yes it was empty. First occurrence. Remove the line. ++g ++d ++bb ++:a ++# The hold space was nonempty. Following occurrences. Do nothing. ++x ++:b ++} +--- gtkpool-0.5.0.orig/po/en@boldquot.header ++++ gtkpool-0.5.0/po/en@boldquot.header +@@ -0,0 +1,25 @@ ++# All this catalog "translates" are quotation characters. ++# The msgids must be ASCII and therefore cannot contain real quotation ++# characters, only substitutes like grave accent (0x60), apostrophe (0x27) ++# and double quote (0x22). These substitutes look strange; see ++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html ++# ++# This catalog translates grave accent (0x60) and apostrophe (0x27) to ++# left single quotation mark (U+2018) and right single quotation mark (U+2019). ++# It also translates pairs of apostrophe (0x27) to ++# left single quotation mark (U+2018) and right single quotation mark (U+2019) ++# and pairs of quotation mark (0x22) to ++# left double quotation mark (U+201C) and right double quotation mark (U+201D). ++# ++# When output to an UTF-8 terminal, the quotation characters appear perfectly. ++# When output to an ISO-8859-1 terminal, the single quotation marks are ++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to ++# grave/acute accent (by libiconv), and the double quotation marks are ++# transliterated to 0x22. ++# When output to an ASCII terminal, the single quotation marks are ++# transliterated to apostrophes, and the double quotation marks are ++# transliterated to 0x22. ++# ++# This catalog furthermore displays the text between the quotation marks in ++# bold face, assuming the VT100/XTerm escape sequences. ++# +--- gtkpool-0.5.0.orig/po/insert-header.sin ++++ gtkpool-0.5.0/po/insert-header.sin +@@ -0,0 +1,23 @@ ++# Sed script that inserts the file called HEADER before the header entry. ++# ++# At each occurrence of a line starting with "msgid ", we execute the following ++# commands. At the first occurrence, insert the file. At the following ++# occurrences, do nothing. The distinction between the first and the following ++# occurrences is achieved by looking at the hold space. ++/^msgid /{ ++x ++# Test if the hold space is empty. ++s/m/m/ ++ta ++# Yes it was empty. First occurrence. Read the file. ++r HEADER ++# Output the file's contents by reading the next line. But don't lose the ++# current line while doing this. ++g ++N ++bb ++:a ++# The hold space was nonempty. Following occurrences. Do nothing. ++x ++:b ++} +--- gtkpool-0.5.0.orig/po/Makevars ++++ gtkpool-0.5.0/po/Makevars +@@ -0,0 +1,25 @@ ++# Makefile variables for PO directory in any package using GNU gettext. ++ ++# Usually the message domain is the same as the package name. ++DOMAIN = $(PACKAGE) ++ ++# These two variables depend on the location of this directory. ++subdir = po ++top_builddir = .. ++ ++# These options get passed to xgettext. ++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ ++ ++# This is the copyright holder that gets inserted into the header of the ++# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding ++# package. (Note that the msgstr strings, extracted from the package's ++# sources, belong to the copyright holder of the package.) Translators are ++# expected to transfer the copyright for their translations to this person ++# or entity, or to disclaim their copyright. The empty string stands for ++# the public domain; in this case the translators are expected to disclaim ++# their copyright. ++COPYRIGHT_HOLDER = Jacques Fortier and Brian Ashe ++ ++# This is the list of locale categories, beyond LC_MESSAGES, for which the ++# message catalogs shall be used. It is usually empty. ++EXTRA_LOCALE_CATEGORIES = +--- gtkpool-0.5.0.orig/po/boldquot.sed ++++ gtkpool-0.5.0/po/boldquot.sed +@@ -0,0 +1,10 @@ ++s/"\([^"]*\)"/“\1”/g ++s/`\([^`']*\)'/‘\1’/g ++s/ '\([^`']*\)' / ‘\1’ /g ++s/ '\([^`']*\)'$/ ‘\1’/g ++s/^'\([^`']*\)' /‘\1’ /g ++s/“”/""/g ++s/“/“/g ++s/”/”/g ++s/‘/‘/g ++s/’/’/g +--- gtkpool-0.5.0.orig/po/quot.sed ++++ gtkpool-0.5.0/po/quot.sed +@@ -0,0 +1,6 @@ ++s/"\([^"]*\)"/“\1”/g ++s/`\([^`']*\)'/‘\1’/g ++s/ '\([^`']*\)' / ‘\1’ /g ++s/ '\([^`']*\)'$/ ‘\1’/g ++s/^'\([^`']*\)' /‘\1’ /g ++s/“”/""/g +--- gtkpool-0.5.0.orig/po/Rules-quot ++++ gtkpool-0.5.0/po/Rules-quot +@@ -0,0 +1,42 @@ ++# Special Makefile rules for English message catalogs with quotation marks. ++ ++DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot ++ ++.SUFFIXES: .insert-header .po-update-en ++ ++en@quot.po-update: en@quot.po-update-en ++en@boldquot.po-update: en@boldquot.po-update-en ++ ++.insert-header.po-update-en: ++ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ ++ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ ++ tmpdir=`pwd`; \ ++ echo "$$lang:"; \ ++ ll=`echo $$lang | sed -e 's/@.*//'`; \ ++ LC_ALL=C; export LC_ALL; \ ++ cd $(srcdir); \ ++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ ++ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "creation of $$lang.po failed!" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi ++ ++en@quot.insert-header: insert-header.sin ++ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header ++ ++en@boldquot.insert-header: insert-header.sin ++ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header ++ ++mostlyclean: mostlyclean-quot ++mostlyclean-quot: ++ rm -f *.insert-header +--- gtkpool-0.5.0.orig/po/en@quot.header ++++ gtkpool-0.5.0/po/en@quot.header +@@ -0,0 +1,22 @@ ++# All this catalog "translates" are quotation characters. ++# The msgids must be ASCII and therefore cannot contain real quotation ++# characters, only substitutes like grave accent (0x60), apostrophe (0x27) ++# and double quote (0x22). These substitutes look strange; see ++# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html ++# ++# This catalog translates grave accent (0x60) and apostrophe (0x27) to ++# left single quotation mark (U+2018) and right single quotation mark (U+2019). ++# It also translates pairs of apostrophe (0x27) to ++# left single quotation mark (U+2018) and right single quotation mark (U+2019) ++# and pairs of quotation mark (0x22) to ++# left double quotation mark (U+201C) and right double quotation mark (U+201D). ++# ++# When output to an UTF-8 terminal, the quotation characters appear perfectly. ++# When output to an ISO-8859-1 terminal, the single quotation marks are ++# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to ++# grave/acute accent (by libiconv), and the double quotation marks are ++# transliterated to 0x22. ++# When output to an ASCII terminal, the single quotation marks are ++# transliterated to apostrophes, and the double quotation marks are ++# transliterated to 0x22. ++# +--- gtkpool-0.5.0.orig/po/POTFILES.in ++++ gtkpool-0.5.0/po/POTFILES.in +@@ -0,0 +1,4 @@ ++# This is the list of all source files with translatable strings. ++ ++gtkpool/options.cpp ++gtkpool/support.cpp +--- gtkpool-0.5.0.orig/po/Makefile.in.in ++++ gtkpool-0.5.0/po/Makefile.in.in +@@ -0,0 +1,317 @@ ++# Makefile for PO directory in any package using GNU gettext. ++# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper ++# ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU General Public ++# License but which still want to provide support for the GNU gettext ++# functionality. ++# Please note that the actual code of GNU gettext is covered by the GNU ++# General Public License and is *not* in the public domain. ++ ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++@SET_MAKE@ ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++localedir = $(datadir)/locale ++gettextsrcdir = $(datadir)/gettext/po ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++MSGMERGE = msgmerge ++MSGMERGE_UPDATE = @MSGMERGE@ --update ++MSGINIT = msginit ++MSGCONV = msgconv ++MSGFILTER = msgfilter ++ ++POFILES = @POFILES@ ++GMOFILES = @GMOFILES@ ++UPDATEPOFILES = @UPDATEPOFILES@ ++DUMMYPOFILES = @DUMMYPOFILES@ ++DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \ ++$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) ++DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \ ++$(POFILES) $(GMOFILES) \ ++$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) ++ ++POTFILES = \ ++ ++CATALOGS = @CATALOGS@ ++ ++# Makevars gets inserted here. (Don't remove this line!) ++ ++.SUFFIXES: ++.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update ++ ++.po.mo: ++ @echo "$(MSGFMT) -c -o $@ $<"; \ ++ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ ++ ++.po.gmo: ++ @lang=`echo $* | sed -e 's,.*/,,'`; \ ++ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo ++ ++.sin.sed: ++ sed -e '/^#/d' $< > t-$@ ++ mv t-$@ $@ ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', ++# otherwise packages like GCC can not be built if only parts of the source ++# have been downloaded. ++ ++$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed ++ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ ++ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ ++ --files-from=$(srcdir)/POTFILES.in \ ++ --copyright-holder='$(COPYRIGHT_HOLDER)' ++ test ! -f $(DOMAIN).po || { \ ++ if test -f $(srcdir)/$(DOMAIN).pot; then \ ++ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ ++ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ ++ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ ++ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ ++ else \ ++ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ ++ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ ++ fi; \ ++ else \ ++ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ ++ fi; \ ++ } ++ ++$(srcdir)/$(DOMAIN).pot: ++ $(MAKE) $(DOMAIN).pot-update ++ ++$(POFILES): $(srcdir)/$(DOMAIN).pot ++ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ ++ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ ++ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot ++ ++ ++install: install-exec install-data ++install-exec: ++install-data: install-data-@USE_NLS@ ++ if test "$(PACKAGE)" = "gettext"; then \ ++ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ for file in $(DISTFILES.common); do \ ++ $(INSTALL_DATA) $(srcdir)/$$file \ ++ $(DESTDIR)$(gettextsrcdir)/$$file; \ ++ done; \ ++ else \ ++ : ; \ ++ fi ++install-data-no: all ++install-data-yes: all ++ $(mkinstalldirs) $(DESTDIR)$(datadir) ++ @catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ ++ dir=$(localedir)/$$lang/LC_MESSAGES; \ ++ $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ ++ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ ++ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ ++ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ ++ if test -n "$$lc"; then \ ++ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ ++ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ ++ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ ++ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ ++ for file in *; do \ ++ if test -f $$file; then \ ++ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ ++ fi; \ ++ done); \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ ++ else \ ++ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ ++ :; \ ++ else \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ fi; \ ++ fi; \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ ++ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ ++ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ ++ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ ++ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ ++ fi; \ ++ done; \ ++ done ++ ++install-strip: install ++ ++installdirs: installdirs-exec installdirs-data ++installdirs-exec: ++installdirs-data: installdirs-data-@USE_NLS@ ++ if test "$(PACKAGE)" = "gettext"; then \ ++ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ else \ ++ : ; \ ++ fi ++installdirs-data-no: ++installdirs-data-yes: ++ $(mkinstalldirs) $(DESTDIR)$(datadir) ++ @catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ ++ dir=$(localedir)/$$lang/LC_MESSAGES; \ ++ $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ ++ if test -n "$$lc"; then \ ++ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ ++ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ ++ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ ++ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ ++ for file in *; do \ ++ if test -f $$file; then \ ++ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ ++ fi; \ ++ done); \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ ++ else \ ++ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ ++ :; \ ++ else \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ ++ fi; \ ++ fi; \ ++ fi; \ ++ done; \ ++ done ++ ++# Define this as empty until I found a useful application. ++installcheck: ++ ++uninstall: uninstall-exec uninstall-data ++uninstall-exec: ++uninstall-data: uninstall-data-@USE_NLS@ ++ if test "$(PACKAGE)" = "gettext"; then \ ++ for file in $(DISTFILES.common); do \ ++ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ ++ done; \ ++ else \ ++ : ; \ ++ fi ++uninstall-data-no: ++uninstall-data-yes: ++ catalogs='$(CATALOGS)'; \ ++ for cat in $$catalogs; do \ ++ cat=`basename $$cat`; \ ++ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ ++ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ ++ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ ++ done; \ ++ done ++ ++check: all ++ ++dvi info tags TAGS ID: ++ ++mostlyclean: ++ rm -f remove-potcdate.sed ++ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po ++ rm -fr *.o ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES *.mo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f $(GMOFILES) ++ ++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: ++ $(MAKE) update-po ++ @$(MAKE) dist2 ++# This is a separate target because 'update-po' must be executed before. ++dist2: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \ ++ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ ++ for file in $$dists; do \ ++ if test -f $$file; then \ ++ cp -p $$file $(distdir); \ ++ else \ ++ cp -p $(srcdir)/$$file $(distdir); \ ++ fi; \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(DOMAIN).pot-update ++ $(MAKE) $(UPDATEPOFILES) ++ $(MAKE) update-gmo ++ ++# General rule for updating PO files. ++ ++.nop.po-update: ++ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ ++ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ ++ tmpdir=`pwd`; \ ++ echo "$$lang:"; \ ++ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ ++ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ ++ cd $(srcdir); \ ++ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ ++ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.po failed!" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi ++ ++$(DUMMYPOFILES): ++ ++update-gmo: Makefile $(GMOFILES) ++ @: ++ ++Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ ++ $(SHELL) ./config.status ++ ++force: ++ ++# Tell versions [3.59,3.63) of GNU make not to export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: --- gtkpool-0.5.0.orig/debian/patches/fix_FTBFS_gcc-3.4 +++ gtkpool-0.5.0/debian/patches/fix_FTBFS_gcc-3.4 @@ -0,0 +1,28 @@ +--- gtkpool-0.5.0/gtkpool/application.cpp 2005-10-05 08:01:56.000000000 +1000 ++++ gtkpool-0.5.0/gtkpool/application.cpp 2005-10-05 08:06:15.966442136 +1000 +@@ -67,11 +67,11 @@ + message_colours[14] = new GdkColor; + + buf_pixmap = NULL; +- table_pixmaps = new (GdkPixmap *)[4]; +- balls_pixmaps = new (GdkPixmap *)[NUM_BALLS]; +- balls_pixmap_masks = new (GdkBitmap *)[NUM_BALLS]; +- balls_big_pixmaps = new (GdkPixmap *)[NUM_BALLS]; +- balls_big_pixmap_masks = new (GdkBitmap *)[NUM_BALLS]; ++ table_pixmaps = new GdkPixmap *[4]; ++ balls_pixmaps = new GdkPixmap *[NUM_BALLS]; ++ balls_pixmap_masks = new GdkBitmap *[NUM_BALLS]; ++ balls_big_pixmaps = new GdkPixmap *[NUM_BALLS]; ++ balls_big_pixmap_masks = new GdkBitmap *[NUM_BALLS]; + running = true; placing_cue = false; + sunk_tf = collide_tf = bounce_tf = false; + connected = false; +@@ -530,7 +530,7 @@ + bb = find_if(balls.begin(), balls.end(), pointer_selects( x, y, hit_moving)); + if(bb != balls.end()) + { +-#if _CPP_CSTDLIB == 1 ++#if 1 // _CPP_CSTDLIB == 1 + // FIXME: horrible, non-portable, converting a vector iterator + // to a pointer using g++ 3.0 private interface :-( + // -- Philip Martin --- gtkpool-0.5.0.orig/debian/patches/fix_FTBFS_gcc-3.2 +++ gtkpool-0.5.0/debian/patches/fix_FTBFS_gcc-3.2 @@ -0,0 +1,97 @@ +--- gtkpool-0.4.99/gtkpool/application.cpp ++++ gtkpool-0.4.99-jtv/gtkpool/application.cpp +@@ -815,7 +815,7 @@ + load_sounds(); + } + +-void Application::print_message(const char *message, int colour = 0) ++void Application::print_message(const char *message, int colour) + { + if (colour > 4) + colour = 14; +--- gtkpool-0.4.99/gtkpool/ball.cpp ++++ gtkpool-0.4.99-jtv/gtkpool/ball.cpp +@@ -53,7 +53,7 @@ + radius = diam = 0; + } + +-Ball::Ball (double x, double y, int d, GdkColor *c, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false) : Point2D(x, y), vel(0, 0), bnc(0, 0), tvec(0, 0) { ++Ball::Ball (double x, double y, int d, GdkColor *c, int cat, bool isq, bool ise, bool isn, bool isso, bool isst) : Point2D(x, y), vel(0, 0), bnc(0, 0), tvec(0, 0) { + radius = (diam = d) / 2; + clr = c; + is_cue = isq; is_eight = ise; is_nine = isn; +@@ -63,7 +63,7 @@ + ball_num = 15; + } + +-Ball::Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false) : Point2D(x, y), vel(0, 0), bnc(0, 0), tvec(0, 0) { ++Ball::Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat, bool isq, bool ise, bool isn, bool isso, bool isst) : Point2D(x, y), vel(0, 0), bnc(0, 0), tvec(0, 0) { + radius = (diam = d) / 2; + clr = (GdkColor *)NULL; + is_cue = isq; is_eight = ise; is_nine = isn; +--- gtkpool-0.4.99/gtkpool/ball.h ++++ gtkpool-0.4.99-jtv/gtkpool/ball.h +@@ -80,8 +80,8 @@ + GdkColor *clr; + + Ball(void); +- Ball (double x, double y, int d, GdkColor *c, int cat, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false); +- Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false); ++ Ball (double x, double y, int d, GdkColor *c, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false); ++ Ball (double x, double y, int d, int bn, GdkPixmap *pixmap, GdkBitmap *c_bmp, GdkPixmap *b_pixmap, GdkBitmap *b_clip_bmp, int cat = other, bool isq = false, bool ise = false, bool isn = false, bool isso = false, bool isst = false); + bool moving (); + void decel (double val); + double pathIntercept (Ball b); +--- gtkpool-0.4.99/gtkpool/game.cpp ++++ gtkpool-0.4.99-jtv/gtkpool/game.cpp +@@ -16,6 +16,7 @@ + ***************************************************************************/ + + #include "game.h" ++#include "moving.h" + #include + + Game::Game(){ +--- gtkpool-0.4.99/gtkpool/game.h ++++ gtkpool-0.4.99-jtv/gtkpool/game.h +@@ -19,10 +19,6 @@ + #define GAME_H + #include + #include +-#include "ball.h" +-#include "check_pocket.h" +-#include "move_balls.h" +-#include "moving.h" + + /** + *@author Brian Ashe +@@ -31,10 +27,12 @@ + class check_pocket; + + enum turns { tplayer1, tplayer2 }; // Tell whose turn it is on +-enum catagories { stripes, solids, other }; // What are they shooting at ++enum categories { stripes, solids, other }; // What are they shooting at + enum player_types { human, computer, remote }; // What type of player (future use) + enum game_types { eight_ball, nine_ball, rotation, snooker, continuous14_1, no_rules }; + ++#include "ball.h" ++ + struct player { + char player_name [30]; // Player's name + int category; // Stripes or solids +@@ -74,3 +72,4 @@ + }; + + #endif ++ +--- gtkpool-0.4.99/gtkpool/sound.cpp ++++ gtkpool-0.4.99-jtv/gtkpool/sound.cpp +@@ -26,7 +26,7 @@ + #include + #include "sound.h" + +-SoundError::SoundError(char *desc, int c, int r = 0, int g = 0){ ++SoundError::SoundError(char *desc, int c, int r, int g){ + description = strdup(desc); + code = c; + requested = r;