--- a/ChangeLog	Tue Jan 09 16:41:17 2007 +0000
+++ b/ChangeLog	Tue Jan 09 17:42:22 2007 +0000
@@ -1,3 +1,9 @@
+2007-01-09  Damien Carbery <[email protected]>
+
+	* patches/control-center-04-add-wallpaper-dialog.diff,
+	  patches/gnome-desktop-01-jds-about-branding.diff,
+	  patches/vino-01-fix-a11y-hang.diff: Rework for new tarballs.
+
 2007-01-09  Damien Carbery <[email protected]>
 
 	* gnome-python.spec: Unbump back to 2.16.2 as 2.17.[12] kill the build

--- a/patches/control-center-04-add-wallpaper-dialog.diff	Tue Jan 09 16:41:17 2007 +0000
+++ b/patches/control-center-04-add-wallpaper-dialog.diff	Tue Jan 09 17:42:22 2007 +0000
@@ -1,9 +1,9 @@
-diff -u control-center-2.16.1/capplets/background/gnome-wp-capplet.c-orig control-center-2.16.1/capplets/background/gnome-wp-capplet.c
---- control-center-2.16.1/capplets/background/gnome-wp-capplet.c-orig	2006-10-20 11:32:47.399571000 +0100
-+++ control-center-2.16.1/capplets/background/gnome-wp-capplet.c	2006-10-20 11:36:23.391708000 +0100
-@@ -846,6 +846,7 @@
+diff -u control-center-2.17.5/capplets/background/gnome-wp-capplet.c-orig control-center-2.17.5/capplets/background/gnome-wp-capplet.c
+--- control-center-2.17.5/capplets/background/gnome-wp-capplet.c-orig	2006-10-20 11:32:47.399571000 +0100
++++ control-center-2.17.5/capplets/background/gnome-wp-capplet.c	2006-10-20 11:36:23.391708000 +0100
+@@ -854,6 +854,7 @@
+   GtkTreeSelection * selection;
    GdkCursor * cursor;
-   const gchar ** args;
    GtkFileFilter *filter;
 +  char *default_dir, *temp_dir;
  
@@ -36,3 +36,5 @@
  					  FALSE);
  
 
+--- gnome-wp-capplet.c.orig	2007-01-09 16:59:43.707930500 +0000
++++ gnome-wp-capplet.c	2007-01-09 17:07:53.391554600 +0000

--- a/patches/gnome-desktop-01-jds-about-branding.diff	Tue Jan 09 16:41:17 2007 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff	Tue Jan 09 17:42:22 2007 +0000
@@ -1,8 +1,9 @@
-diff -urN gnome-desktop-2.14.1.1/Makefile.am gnome-desktop-2.14.1.1-hacked/Makefile.am
---- gnome-desktop-2.14.1.1/Makefile.am	2006-04-11 01:17:35.000000000 +1200
-+++ gnome-desktop-2.14.1.1-hacked/Makefile.am	2006-04-28 12:31:36.869661000 +1200
-@@ -1,3 +1,9 @@
-+
+diff -urN gnome-desktop-2.17.5/Makefile.am gnome-desktop-2.17.5-hacked/Makefile.am
+--- gnome-desktop-2.17.5/Makefile.am	2006-04-11 01:17:35.000000000 +1200
++++ gnome-desktop-2.17.5-hacked/Makefile.am	2006-04-28 12:31:36.869661000 +1200
+@@ -1,5 +1,10 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
 +XML_IN_FILES= gnome-version.xml.in
 +XML_FILES = $(XML_IN_FILES:.xml.in=.xml)
 +versiondir=$(datadir)/gnome-about
@@ -231,41 +232,35 @@
  
  	g_date_free (date);
  
-@@ -770,8 +796,8 @@
+@@ -823,6 +823,7 @@
  	char *platform = NULL;
  	char *minor = NULL;
  	char *micro = NULL;
--	char *version_string = NULL;
- 	char *distributor_string = NULL;
 +	char *distributor_version_string = NULL;
- 	char *build_date_string = NULL;
- 	char *text = NULL;
  
-@@ -817,6 +843,8 @@
- 			minor = g_strdup (value);
- 		if (!g_ascii_strcasecmp (name, "micro") && value && value[0])
- 			micro = g_strdup (value);
+ 	file = gnome_program_locate_file (NULL,
+ 					  GNOME_FILE_DOMAIN_APP_DATADIR,
+@@ -866,6 +867,8 @@
+ 			*distributor_string = g_strdup (value);
+ 		else if (!g_ascii_strcasecmp (name, "date") && value && value[0])
+ 			*build_date_string = create_date_string (value);
 +		if (!g_ascii_strcasecmp (name, "distributor-version") && value && value[0])
 +			distributor_version_string = g_strdup (value);
- 		if (!g_ascii_strcasecmp (name, "distributor") && value && value[0])
- 			distributor_string = g_strdup (value);
- 		if (!g_ascii_strcasecmp (name, "date") && value && value[0])
-@@ -832,10 +860,10 @@
- 		version_string = g_strconcat (platform, NULL);
  
- 	if (!version_string && !micro)
--		version_string = g_strconcat (platform, ".", minor, NULL);
-+		version_string = g_strconcat (platform, " ", minor, NULL);
+ 		bits = bits->next;
+ 		xmlFree (value);
+@@ -880,7 +883,7 @@
+ 		*version_string = g_strconcat (platform, ".", minor, NULL);
  
- 	if (!version_string)
--		version_string = g_strconcat (platform, ".", minor, ".",
-+		version_string = g_strconcat (platform, " ", minor, ".",
- 					      micro, NULL);
+ 	if (!*version_string)
+-		*version_string = g_strconcat (platform, ".", minor, ".",
++		*version_string = g_strconcat (platform, " ", minor, ".",
+ 					       micro, NULL);
  
  	g_free (platform);
-@@ -847,22 +875,38 @@
- 				      "x", 10.0,
- 				      NULL);
+@@ -939,22 +942,38 @@
+ 
+ 	format = g_strdup_printf ("<b>%s</b>%%s", _("%s: "));
  
 -	if (version_string && version_string[0]) {
 +	if (distributor_version_string && distributor_version_string[0]) {
@@ -274,12 +269,12 @@
 +		text = g_strdup_printf ("<b>%s: </b>%s",
 +					_("Version"), distributor_version_string);
 +		version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
-+					              gnome_canvas_text_get_type (),
-+					              "markup", text,
-+					              "anchor", GTK_ANCHOR_NW,
-+					              "x", 0.0,
-+					              "y", height,
-+					              NULL);
++						      gnome_canvas_text_get_type (),
++						      "markup", text,
++						      "anchor", GTK_ANCHOR_NW,
++						      "x", 0.0,
++						      "y", height,
++						      NULL);
 +		g_free (text);
 +
 +		g_object_get (version_text, "text_height", &tmp, NULL);
@@ -289,7 +284,7 @@
  		gdouble tmp;
 -		GnomeCanvasItem *item;
  
- 		text = g_strdup_printf ("<b>%s: </b>%s",
+ 		text = g_strdup_printf (format,
  					_("Version"), version_string);
 -		item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
 -					      gnome_canvas_text_get_type (),
@@ -299,12 +294,12 @@
 -					      "y", height,
 -					      NULL);
 +		version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
-+					              gnome_canvas_text_get_type (),
-+					              "markup", text,
-+					              "anchor", GTK_ANCHOR_NW,
-+					              "x", 0.0,
-+					              "y", height,
-+					              NULL);
++						      gnome_canvas_text_get_type (),
++						      "markup", text,
++						      "anchor", GTK_ANCHOR_NW,
++						      "x", 0.0,
++						      "y", height,
++						      NULL);
  		g_free (text);
  
 -		g_object_get (item, "text_height", &tmp, NULL);
@@ -312,10 +307,10 @@
  		height += tmp + 4.0;
  	}
  
-@@ -904,8 +948,8 @@
- 		height += tmp + 4.0;
+@@ -997,8 +1016,8 @@
  	}
  
+ 	g_free (format);
 -	g_free (version_string);
  	g_free (distributor_string);
 +	g_free (distributor_version_string);
@@ -443,9 +438,9 @@
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-desktop
---- gnome-desktop-2.16.1.old/configure.in	2006-10-19 16:54:29.498958000 +0100
-+++ gnome-desktop-2.16.1/configure.in	2006-10-19 16:57:57.110569000 +0100
-@@ -39,15 +39,21 @@
+--- gnome-desktop-2.17.5.old/configure.in	2006-10-19 16:54:29.498958000 +0100
++++ gnome-desktop-2.17.5/configure.in	2006-10-19 16:57:57.110569000 +0100
+@@ -40,15 +40,21 @@
  GNOME_DATE=`date +"%Y-%m-%d"`
  
  AC_ARG_WITH(gnome_distributor, [  --with-gnome-distributor=DISTRIBUTOR  Specify name of GNOME distributor])
@@ -466,4 +461,4 @@
 +AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
  AC_SUBST(GNOME_DATE)
  
- GNOME_COMPILE_WARNINGS(yes)
+ GNOME_COMMON_INIT

--- a/patches/vino-01-fix-a11y-hang.diff	Tue Jan 09 16:41:17 2007 +0000
+++ b/patches/vino-01-fix-a11y-hang.diff	Tue Jan 09 17:42:22 2007 +0000
@@ -5,10 +5,10 @@
 diff -u -r1.3 vino-main.c
 --- vino/server/vino-main.c	13 Jan 2006 12:12:54 -0000	1.3
 +++ vino/server/vino-main.c	16 Oct 2006 08:00:54 -0000
-@@ -30,6 +30,7 @@
- #include "vino-shell.h"
+@@ -31,6 +31,7 @@
  #include "vino-prefs.h"
  #include "vino-util.h"
+ #include "vino-dbus-listener.h"
 +#include <libgnomeui/libgnomeui.h>
  
  #ifdef HAVE_GNUTLS
@@ -42,3 +42,5 @@
    shell = g_object_new (vino_shell_get_type (), NULL);
  
    display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+--- vino-main.c.orig	2007-01-09 17:10:26.696066900 +0000
++++ vino-main.c	2007-01-09 17:10:53.710609000 +0000