[pkg-ggz-commits] r385 - in trunk: . ggz-base-libs/debian ggz-gtk-client ggz-gtk-client/debian ggz-gtk-client/debian/patches
josef-guest at alioth.debian.org
josef-guest at alioth.debian.org
Sat Oct 25 21:13:55 UTC 2008
Author: josef-guest
Date: 2008-10-25 21:13:55 +0000 (Sat, 25 Oct 2008)
New Revision: 385
Added:
trunk/ggz-gtk-client/debian/ggz-gtk-games-data.docs
trunk/ggz-gtk-client/debian/ggz-gtk-games-data.install
trunk/ggz-gtk-client/debian/ggz-gtk-games.install
trunk/ggz-gtk-client/debian/ggz-gtk-games.postinst
trunk/ggz-gtk-client/debian/ggz-gtk-games.prerm
Removed:
trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch
trunk/ggz-gtk-client/debian/patches/login.patch
trunk/ggz-gtk-client/po/
trunk/ggz-gtk-games/
Modified:
trunk/ggz-base-libs/debian/libggz-dev.install
trunk/ggz-gtk-client/debian/changelog
trunk/ggz-gtk-client/debian/control
trunk/ggz-gtk-client/debian/copyright
trunk/ggz-gtk-client/debian/rules
Log:
- next merge: ggz-gtk-client eats ggz-gtk-games
- there are still some issues which will be fixed once 0.99.5 gets out
Modified: trunk/ggz-base-libs/debian/libggz-dev.install
===================================================================
--- trunk/ggz-base-libs/debian/libggz-dev.install 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-base-libs/debian/libggz-dev.install 2008-10-25 21:13:55 UTC (rev 385)
@@ -1,5 +1,6 @@
debian/tmp/usr/include/ggz.h
debian/tmp/usr/include/ggz_common.h
+debian/tmp/usr/include/ggz_dio.h
debian/tmp/usr/lib/libggz.a
debian/tmp/usr/lib/libggz.la
debian/tmp/usr/lib/libggz.so
Modified: trunk/ggz-gtk-client/debian/changelog
===================================================================
--- trunk/ggz-gtk-client/debian/changelog 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/changelog 2008-10-25 21:13:55 UTC (rev 385)
@@ -1,3 +1,10 @@
+ggz-gtk-client (0.99.5pre-1) experimental; urgency=low
+
+ * New experimental upstream version
+ - Merges ggz-gtk-client and ggz-gtk-games
+
+ -- Josef Spillner <josef at ggzgamingzone.org> Sat, 25 Oct 2008 22:55:32 +0200
+
ggz-gtk-client (0.0.14.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/ggz-gtk-client/debian/control
===================================================================
--- trunk/ggz-gtk-client/debian/control 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/control 2008-10-25 21:13:55 UTC (rev 385)
@@ -4,7 +4,7 @@
Maintainer: Debian GGZ Maintainers <pkg-ggz-maintainers at lists.alioth.debian.org>
Uploaders: Josef Spillner <josef at ggzgamingzone.org>, Peter Eisentraut <petere at debian.org>
Standards-Version: 3.7.3
-Build-Depends: cdbs, debhelper (>= 5), libggzmod-dev (>= 0.0.14), libgtk2.0-dev
+Build-Depends: cdbs, debhelper (>= 5), libggzmod-dev (>= 0.99.5), libgtk2.0-dev, gettext, libgtk2.0-dev, ggzcore-bin (>= 0.99.5)
Build-Conflicts: gaim-dev
Vcs-Svn: svn://svn.debian.org/pkg-ggz/trunk/ggz-gtk-client/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ggz/trunk/ggz-gtk-client/
@@ -58,3 +58,44 @@
.
This package is part of the GGZ Gaming Zone, a multiuser networked
gaming environment.
+
+Package: ggz-gtk-games
+Architecture: any
+Depends: ${shlibs:Depends}, ggz-gtk-games-data (>= ${source:Upstream-Version}), ggzcore-bin (>= ${source:Upstream-Version})
+Recommends: ggz-gtk-client | ggz-core-client
+Description: GGZ Gaming Zone: game clients collection for GTK+
+ GGZ games are games that can be played online against other people while
+ all having some features in common, like table chat, seats configuration,
+ bot players, game spectators, savegames, statistics, and others. Some
+ games also work in single-player mode.
+ .
+ This package provides the complete collection of GGZ game frontends that
+ make use of the GTK+ toolkit. It includes:
+ * Chess
+ * Chinese Checkers
+ * Combat
+ * Connect-the-Dots
+ * GGZCards (engine for La Pocha, Hearts, Bridge, FortyTwo etc.)
+ * Hastings1066
+ * Reversi
+ * Spades
+ * TicTacToe
+ and much more.
+ .
+ This package is part of the GGZ Gaming Zone, a multiuser networked
+ gaming environment.
+
+Package: ggz-gtk-games-data
+Architecture: all
+Depends: ggz-gtk-games (>= ${source:Upstream-Version})
+Description: GGZ Gaming Zone: multimedia data for game clients for GTK+
+ GGZ games are games that can be played online against other people while
+ all having some features in common, like table chat, seats configuration,
+ bot players, game spectators, savegames, statistics, and others. Some
+ games also work in single-player mode.
+ .
+ This package provides the data files for the complete collection of GGZ
+ game frontends that make use of the GTK+ toolkit.
+ .
+ This package is part of the GGZ Gaming Zone, a multiuser networked
+ gaming environment.
Modified: trunk/ggz-gtk-client/debian/copyright
===================================================================
--- trunk/ggz-gtk-client/debian/copyright 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/copyright 2008-10-25 21:13:55 UTC (rev 385)
@@ -1,5 +1,5 @@
This is the Debian GNU/Linux prepackaged version of ggz-gtk-client,
-the GGZ GTK+ client.
+the GGZ GTK+ client and an associated collection of GGZ games.
This software was first packaged for Debian by Stephen Zander
<gibreel at debian.org> Sat, 31 Aug 2002 10:40:00 -0700 using upstream
@@ -11,7 +11,7 @@
Copyright:
The GGZ Gaming Zone
- Copyright (C) 1999-2006 The GGZ Gaming Zone Development Team
+ Copyright (C) 1999-2008 The GGZ Gaming Zone Development Team
Contact the upstream authors at <ggz-dev at mail.ggzgamingzone.org>
@@ -21,3 +21,7 @@
The ggz-gtk core client contains the xtext chat widget from xchat which
is Copyright (C) 1998 Peter Zelezny, licenced under the GNU GPL.
See /usr/share/common-licenses/GPL for details.
+
+The chess game client contains the libcgc library which is
+Copyright (C) 2000 Dan Papasian, under a 3-clause BSD licence.
+See /usr/share/common-licenses/BSD for details.
Added: trunk/ggz-gtk-client/debian/ggz-gtk-games-data.docs
===================================================================
--- trunk/ggz-gtk-client/debian/ggz-gtk-games-data.docs (rev 0)
+++ trunk/ggz-gtk-client/debian/ggz-gtk-games-data.docs 2008-10-25 21:13:55 UTC (rev 385)
@@ -0,0 +1 @@
+README.GGZ
Added: trunk/ggz-gtk-client/debian/ggz-gtk-games-data.install
===================================================================
--- trunk/ggz-gtk-client/debian/ggz-gtk-games-data.install (rev 0)
+++ trunk/ggz-gtk-client/debian/ggz-gtk-games-data.install 2008-10-25 21:13:55 UTC (rev 385)
@@ -0,0 +1 @@
+debian/tmp/usr/share/ggz
Added: trunk/ggz-gtk-client/debian/ggz-gtk-games.install
===================================================================
--- trunk/ggz-gtk-client/debian/ggz-gtk-games.install (rev 0)
+++ trunk/ggz-gtk-client/debian/ggz-gtk-games.install 2008-10-25 21:13:55 UTC (rev 385)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/ggz
Added: trunk/ggz-gtk-client/debian/ggz-gtk-games.postinst
===================================================================
--- trunk/ggz-gtk-client/debian/ggz-gtk-games.postinst (rev 0)
+++ trunk/ggz-gtk-client/debian/ggz-gtk-games.postinst 2008-10-25 21:13:55 UTC (rev 385)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-gtk-games
+
+#DEBHELPER#
Added: trunk/ggz-gtk-client/debian/ggz-gtk-games.prerm
===================================================================
--- trunk/ggz-gtk-client/debian/ggz-gtk-games.prerm (rev 0)
+++ trunk/ggz-gtk-client/debian/ggz-gtk-games.prerm 2008-10-25 21:13:55 UTC (rev 385)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-gtk-games
+
+#DEBHELPER#
Deleted: trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch
===================================================================
--- trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch 2008-10-25 21:13:55 UTC (rev 385)
@@ -1,39 +0,0 @@
-diff -Nur ggz-gtk-client-0.0.14.1/po/Makefile.am ggz-gtk-client-0.0.14.1.new/po/Makefile.am
---- ggz-gtk-client-0.0.14.1/po/Makefile.am 2008-03-16 23:24:19.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.new/po/Makefile.am 2008-03-16 23:24:26.000000000 +0100
-@@ -1,6 +1,6 @@
- EXTRA_DIST = ggz-gtk.pot $(pofiles)
-
--CATALOG = ggz-gtk
-+CATALOG = ggz-gtk1
- POSOURCES = $(top_srcdir)/ggz-gtk/*.c $(top_srcdir)/src/*.c
-
- include $(top_srcdir)/m4/i18n.mk
-diff -Nur ggz-gtk-client-0.0.14.1/po/Makefile.in ggz-gtk-client-0.0.14.1.new/po/Makefile.in
---- ggz-gtk-client-0.0.14.1/po/Makefile.in 2008-02-16 22:01:29.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.new/po/Makefile.in 2008-03-16 23:24:42.000000000 +0100
-@@ -198,7 +198,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = ggz-gtk.pot $(pofiles)
--CATALOG = ggz-gtk
-+CATALOG = ggz-gtk1
- POSOURCES = $(top_srcdir)/ggz-gtk/*.c $(top_srcdir)/src/*.c
- MOFILES = $(builddir)/*.mo
- STAMP = $(builddir)/translation.stamp
-diff -Nur ggz-gtk-client-0.0.14.1/src/main.c ggz-gtk-client-0.0.14.1.new/src/main.c
---- ggz-gtk-client-0.0.14.1/src/main.c 2008-03-16 23:24:19.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.new/src/main.c 2008-03-16 23:24:26.000000000 +0100
-@@ -97,9 +97,9 @@
- #ifdef ENABLE_NLS
- /* GTK2 always uses UTF-8 so we tell gettext to output its
- * translations in that. */
-- bindtextdomain("ggz-gtk", PACKAGE_LOCALE_DIR);
-- bind_textdomain_codeset("ggz-gtk", "UTF-8");
-- textdomain("ggz-gtk");
-+ bindtextdomain("ggz-gtk1", PACKAGE_LOCALE_DIR);
-+ bind_textdomain_codeset("ggz-gtk1", "UTF-8");
-+ textdomain("ggz-gtk1");
- setlocale(LC_ALL, "");
- #endif
-
Deleted: trunk/ggz-gtk-client/debian/patches/login.patch
===================================================================
--- trunk/ggz-gtk-client/debian/patches/login.patch 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/patches/login.patch 2008-10-25 21:13:55 UTC (rev 385)
@@ -1,38 +0,0 @@
-diff -Nur ggz-gtk-client-0.0.14.1/ggz-gtk/login.c ggz-gtk-client-0.0.14.1.new/ggz-gtk/login.c
---- ggz-gtk-client-0.0.14.1/ggz-gtk/login.c 2008-02-14 18:51:57.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.new/ggz-gtk/login.c 2008-03-16 23:02:12.000000000 +0100
-@@ -597,7 +597,7 @@
- gtk_entry_set_max_length(GTK_ENTRY(host_entry), 256);
- gtk_box_pack_start(GTK_BOX(server_box), host_entry, FALSE, FALSE,
- 5);
-- gtk_entry_set_text(GTK_ENTRY(host_entry), _("localhost"));
-+ gtk_entry_set_text(GTK_ENTRY(host_entry), "localhost");
-
- port_label = gtk_label_new(_("Port:"));
- gtk_box_pack_start(GTK_BOX(server_box), port_label, FALSE, TRUE,
-@@ -707,12 +707,6 @@
- TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox), 5);
-
-- connect_button = stockbutton_new(GTK_STOCK_JUMP_TO, _("Connect"));
-- g_object_set_data(G_OBJECT(dlg_login),
-- "connect_button", connect_button);
-- gtk_container_add(GTK_CONTAINER(hbuttonbox), connect_button);
-- GTK_WIDGET_SET_FLAGS(connect_button, GTK_CAN_DEFAULT);
--
- if (ggz_closed_cb) {
- cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- } else {
-@@ -721,6 +715,12 @@
- gtk_container_add(GTK_CONTAINER(hbuttonbox), cancel_button);
- GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
-
-+ connect_button = stockbutton_new(GTK_STOCK_JUMP_TO, _("Connect"));
-+ g_object_set_data(G_OBJECT(dlg_login),
-+ "connect_button", connect_button);
-+ gtk_container_add(GTK_CONTAINER(hbuttonbox), connect_button);
-+ GTK_WIDGET_SET_FLAGS(connect_button, GTK_CAN_DEFAULT);
-+
- g_signal_connect(GTK_OBJECT(dlg_login), "realize",
- GTK_SIGNAL_FUNC(login_fill_defaults),
- ggz_strdup(default_profile));
Modified: trunk/ggz-gtk-client/debian/rules
===================================================================
--- trunk/ggz-gtk-client/debian/rules 2008-10-25 20:02:15 UTC (rev 384)
+++ trunk/ggz-gtk-client/debian/rules 2008-10-25 21:13:55 UTC (rev 385)
@@ -4,6 +4,8 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS = --bindir=/usr/games --disable-debug
+DEB_CONFIGURE_EXTRA_FLAGS = --bindir=/usr/games --disable-debug --enable-noregistry=/usr/share/ggz/modules/ggz-gtk-games
DEB_DH_MAKESHLIBS_ARGS_ALL = -V
DEB_SHLIBDEPS_INCLUDE = $(DEB_DESTDIR)/usr/lib
+
+LDFLAGS += -Wl,--as-needed
More information about the pkg-ggz-commits
mailing list