[pkg-ggz-commits] r345 - in trunk/ggz-gtk-client/debian: . patches
petere at alioth.debian.org
petere at alioth.debian.org
Sun Mar 16 22:37:48 UTC 2008
Author: petere
Date: 2008-03-16 22:37:47 +0000 (Sun, 16 Mar 2008)
New Revision: 345
Modified:
trunk/ggz-gtk-client/debian/changelog
trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch
trunk/ggz-gtk-client/debian/patches/login.patch
Log:
- Updated ggz-gtk-catalog-name.patch, login.patch
Modified: trunk/ggz-gtk-client/debian/changelog
===================================================================
--- trunk/ggz-gtk-client/debian/changelog 2008-03-16 21:36:52 UTC (rev 344)
+++ trunk/ggz-gtk-client/debian/changelog 2008-03-16 22:37:47 UTC (rev 345)
@@ -1,6 +1,7 @@
ggz-gtk-client (0.0.14.1-1) UNRELEASED; urgency=low
* New upstream release
+ - Updated ggz-gtk-catalog-name.patch, login.patch
-- Peter Eisentraut <petere at debian.org> Sun, 16 Mar 2008 22:35:50 +0100
Modified: trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch
===================================================================
--- trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch 2008-03-16 21:36:52 UTC (rev 344)
+++ trunk/ggz-gtk-client/debian/patches/ggz-gtk-catalog-name.patch 2008-03-16 22:37:47 UTC (rev 345)
@@ -1,30 +1,29 @@
-diff -Nur ggz-gtk-client-0.0.14/po/Makefile.am ggz-gtk-client-0.0.14.new/po/Makefile.am
---- ggz-gtk-client-0.0.14/po/Makefile.am 2007-01-16 19:51:03.000000000 +0100
-+++ ggz-gtk-client-0.0.14.new/po/Makefile.am 2007-07-10 23:10:12.000000000 +0200
-@@ -5,7 +5,7 @@
+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)
- EXTRA_DIST = ggz-gtk.pot de.po es.po pt_BR.po sv.po
-
-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/po/Makefile.in ggz-gtk-client-0.0.14.new/po/Makefile.in
---- ggz-gtk-client-0.0.14/po/Makefile.in 2007-01-16 20:08:11.000000000 +0100
-+++ ggz-gtk-client-0.0.14.new/po/Makefile.in 2007-07-10 23:10:29.000000000 +0200
-@@ -215,7 +215,7 @@
- target_alias = @target_alias@
- SUBDIRS = .
- EXTRA_DIST = ggz-gtk.pot de.po es.po pt_BR.po sv.po
+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
- builddir = $(top_builddir)/$(subdir)
MOFILES = $(builddir)/*.mo
-diff -Nur ggz-gtk-client-0.0.14/src/main.c ggz-gtk-client-0.0.14.new/src/main.c
---- ggz-gtk-client-0.0.14/src/main.c 2007-01-16 19:51:02.000000000 +0100
-+++ ggz-gtk-client-0.0.14.new/src/main.c 2007-07-10 23:09:13.000000000 +0200
+ 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
Modified: trunk/ggz-gtk-client/debian/patches/login.patch
===================================================================
--- trunk/ggz-gtk-client/debian/patches/login.patch 2008-03-16 21:36:52 UTC (rev 344)
+++ trunk/ggz-gtk-client/debian/patches/login.patch 2008-03-16 22:37:47 UTC (rev 345)
@@ -1,55 +1,38 @@
---- ggz-gtk-client-0.0.14/ggz-gtk/login.c 2007-01-16 19:51:03.000000000 +0100
-+++ gnome-games-2.18.0.1/dependencies/ggz-gtk/login.c 2007-03-20 21:20:11.000000000 +0100
-@@ -2,7 +2,7 @@
- * File: login.c
- * Author: Justin Zaun
- * Project: GGZ GTK Client
-- * $Id: login.c 8564 2006-08-31 19:05:43Z jdorje $
-+ * $Id: login.c 5856 2007-01-13 20:00:19Z andreasr $
- *
- * This is the main program body for the GGZ client
- *
-@@ -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,
-@@ -609,7 +609,7 @@
- gtk_entry_set_max_length(GTK_ENTRY(port_entry), 5);
- gtk_box_pack_start(GTK_BOX(server_box), port_entry, FALSE, FALSE,
- 0);
-- gtk_entry_set_text(GTK_ENTRY(port_entry), _("5688"));
-+ gtk_entry_set_text(GTK_ENTRY(port_entry), "5688");
-
- msg_label = gtk_label_new("");
- g_object_set_data(G_OBJECT(dlg_login), "msg_label", msg_label);
-@@ -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));
+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));
More information about the pkg-ggz-commits
mailing list