r8304 - in packages/trunk/gnome-chess/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-10-27 23:28:02 +0000 (Mon, 27 Oct 2008)
New Revision: 8304

Added:
   packages/trunk/gnome-chess/debian/patches/20_misc_fixes.diff
Modified:
   packages/trunk/gnome-chess/debian/changelog
   packages/trunk/gnome-chess/debian/patches/series
   packages/trunk/gnome-chess/debian/rules
Log:
added dh_gconf to rules + fixed a few bugs in the source


Modified: packages/trunk/gnome-chess/debian/changelog
===================================================================
--- packages/trunk/gnome-chess/debian/changelog	2008-10-26 17:30:49 UTC (rev 8303)
+++ packages/trunk/gnome-chess/debian/changelog	2008-10-27 23:28:02 UTC (rev 8304)
@@ -5,6 +5,9 @@
 
   [ Peter De Wachter ]
   * Added watch file.
+  * Added dh_conf in rules. (Closes: #472866)
+  * Fixed localization bugs. (Closes: #503735)
+  * Fixed a few other obvious bugs (don't worry, plenty remain :)
 
  -- Barry deFreese <bddebian at comcast.net>  Sat, 08 Mar 2008 23:59:26 -0500
 

Added: packages/trunk/gnome-chess/debian/patches/20_misc_fixes.diff
===================================================================
--- packages/trunk/gnome-chess/debian/patches/20_misc_fixes.diff	                        (rev 0)
+++ packages/trunk/gnome-chess/debian/patches/20_misc_fixes.diff	2008-10-27 23:28:02 UTC (rev 8304)
@@ -0,0 +1,116 @@
+--- a/src/child.c
++++ b/src/child.c
+@@ -52,7 +52,7 @@
+ 	GIOError err;
+ 	va_list ap;
+ 	char *buf;
+-	int len;	
++	gsize len;
+ 
+ 	va_start (ap, format);
+ 
+--- a/src/engine_ics.c
++++ b/src/engine_ics.c
+@@ -640,7 +640,7 @@
+ int 
+ engine_ics_input (char *buf, int max) 
+ {
+-	guint len;
++	gsize len;
+ 
+ 	if (have_read) {
+ 		have_read = FALSE;
+--- a/src/engine_local.c
++++ b/src/engine_local.c
+@@ -562,7 +562,7 @@
+ 	static char *b=buf;
+ 
+ 	char *p,*q;
+-	ssize_t len;
++	gsize len;
+ 
+ 	engine = ENGINE_LOCAL (data);
+ 	priv = engine->priv;
+--- a/src/game-view.c
++++ b/src/game-view.c
+@@ -199,10 +199,10 @@
+ 	GameView *view;
+ 	GameViewPrivate *priv;
+ 
+-	if (priv != NULL) {
+-		view = GAME_VIEW (object);
+-		priv = view->priv;
++	view = GAME_VIEW (object);
++	priv = view->priv;
+ 		
++	if (priv != NULL) {
+ 		prefs_rm_notification (priv->light_id);
+ 		prefs_rm_notification (priv->dark_id);
+ 		
+--- a/src/engine-view.c
++++ b/src/engine-view.c
+@@ -121,6 +121,7 @@
+ 	priv = view->priv;
+ 
+ 	g_free (priv);
++	view->priv = NULL;
+ 
+ 	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ }
+--- a/src/engine-window.c
++++ b/src/engine-window.c
+@@ -242,7 +242,7 @@
+ 
+ 	priv = window->priv;
+ 	
+-	gnome_app_remove_menus (GNOME_APP (window), "File/New/Programs/", 
++	gnome_app_remove_menus (GNOME_APP (window), "_File/_New/_Programs/",
+ 				g_slist_length (priv->program_md));
+ 	
+ 	for (l = priv->program_md; l != NULL; l = l->next)
+@@ -270,7 +270,7 @@
+ 				GNOMEUIINFO_END};
+ 		
+ 			gnome_app_insert_menus (GNOME_APP (window), 
+-						"File/New/Programs/", info);
++						"_File/_New/_Programs/", info);
+ 		}
+ 	}
+ }
+@@ -291,7 +291,7 @@
+ 
+ 	priv = window->priv;	
+ 
+-	gnome_app_remove_menus (GNOME_APP (window), "File/New/Servers/",
++	gnome_app_remove_menus (GNOME_APP (window), "_File/_New/_Servers/",
+ 				g_slist_length (priv->server_md));
+ 
+ 	for (l = priv->server_md; l != NULL; l = l->next)
+@@ -319,7 +319,7 @@
+ 				GNOMEUIINFO_END};
+ 		
+ 			gnome_app_insert_menus (GNOME_APP (window), 
+-						"File/New/Servers/", info);
++						"_File/_New/_Servers/", info);
+ 		}
+ 	}	
+ }
+@@ -342,7 +342,7 @@
+ 
+ static GnomeUIInfo file_new_menu[] = {
+ 
+-	GNOMEUIINFO_MENU_NEW_ITEM ("_New Scratch", "New scratch board", menu_new, NULL),
++	GNOMEUIINFO_MENU_NEW_ITEM (N_("_New Scratch"), N_("New scratch board"), menu_new, NULL),
+ 
+ 	GNOMEUIINFO_SUBTREE_STOCK (N_("_Programs"), file_play_menu, GNOME_STOCK_MENU_EXEC),
+ 
+--- a/src/main.c
++++ b/src/main.c
+@@ -71,6 +71,7 @@
+ 	
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOME_CHESS_LOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++	textdomain (GETTEXT_PACKAGE);
+ 
+ 	/* Command Line Args */
+ 	gnome_init_with_popt_table (PACKAGE, 

Modified: packages/trunk/gnome-chess/debian/patches/series
===================================================================
--- packages/trunk/gnome-chess/debian/patches/series	2008-10-26 17:30:49 UTC (rev 8303)
+++ packages/trunk/gnome-chess/debian/patches/series	2008-10-27 23:28:02 UTC (rev 8304)
@@ -1 +1,2 @@
 10_desktop_fixes.diff
+20_misc_fixes.diff

Modified: packages/trunk/gnome-chess/debian/rules
===================================================================
--- packages/trunk/gnome-chess/debian/rules	2008-10-26 17:30:49 UTC (rev 8303)
+++ packages/trunk/gnome-chess/debian/rules	2008-10-27 23:28:02 UTC (rev 8304)
@@ -6,6 +6,9 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS=--with-gconf-schema-file-dir=/usr/share/gconf/schemas
 
+binary-install/gnome-chess::
+	dh_gconf
+
 makebuilddir::
 	cp /usr/share/misc/config.sub $(CURDIR)
 	cp /usr/share/misc/config.guess $(CURDIR)