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

+version_DATA= $(XML_FILES)

+

 SUBDIRS =			\

 	po 			\

 	libgnome-desktop 	\

@@ -8,8 +14,8 @@

 	man

 EXTRA_DIST =			\

-	gnome-version.xml.in.in	\

-	gnome-version.xml	\

+	$(XML_IN_FILES)		\

+	$(XML_FILES)		\

 	gnome-desktop.spec.in	\

 	gnome-desktop.spec	\

 	COPYING-DOCS		\

@@ -19,8 +25,9 @@

 	intltool-update.in	\

 	gnome-doc-utils.make

-versiondir=$(datadir)/gnome-about

-version_DATA=gnome-version.xml

+

+

+

 @INTLTOOL_XML_RULE@

 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper

diff -urN gnome-desktop-2.14.1.1/gnome-about/contributors.h gnome-desktop-2.14.1.1-hacked/gnome-about/contributors.h

--- gnome-desktop-2.14.1.1/gnome-about/contributors.h	2006-04-03 12:56:14.000000000 +1200

+++ gnome-desktop-2.14.1.1-hacked/gnome-about/contributors.h	2006-04-28 12:31:36.871473000 +1200

@@ -345,6 +345,86 @@

 	"Orest Zborowski",

 	"Sascha Ziemann",

 	"Michael Zucchi",

-	"Jason van Zyl"

+	"Jason van Zyl",

+       "Sowmya Adiga",

+       "Vijay Anand",

+       "Dan Baigent",

+       "Geoff Baysinger",

+       "Leo Binchy",

+       "Chandrashekhar BK",

+       "Oliver Braun",

+       "Suresh Chandrasekharan",

+       "Martin Damboldt",

+       "Simford Dong",

+       "Mark Duggan",

+       "Olaf Felka",

+       "Carl Gadener",

+       "Karl Gaffney",

+       "Dirk Grobler",

+       "Patrick Gu",

+       "Leena Gunda",

+       "Ii Gyoung Park",

+       "Susan Jefferies",

+       "Henry Jia",

+       "Jack Jia",

+       "Rick Ju",

+       "Matt Keenan",

+       "Robert Kinsella",

+       "Laszlo Kovacs",

+       "Michael Krivoruchko",

+       "Girish Kulkarni",

+       "Lalith Kumar",

+       "Vishnu Kumar",

+       "Biswa Lal",

+       "Thorsten Laux",

+       "Nancy Lee",

+       "Mike Lei",

+       "Jessie Li",

+       "Gary Little",

+       "Calvin Liu",

+       "Harry Lu",

+       "Robin Lu",

+       "Vinay M R",

+       "Yogeesh MB",

+       "Dermot McCluskey",

+       "Jeff McMeekin",

+       "Ashish Mukharji",

+       "Kaveri Murthy",

+       "Muktha Narayan",

+       "Brian Nitz",

+       "Shane O'Connor",

+       "Robert O'Dea",

+       "Narayana Pattipati",

+       "Vijaykumar Patwari",

+       "Laszlo Peter",

+       "Terry Ponce",

+       "Niall Power",

+       "Partha Pratim",

+       "Derek Rafter",

+       "Curtis Sasaki",

+       "Hema Seetharamaiah",

+       "Leon Sha",

+       "Archana Shah",

+       "Kalpesh Shah",

+       "Srirama Sharma",

+       "Luke Shi",

+       "Louise Siu",

+       "Anand Subramanian",

+       "Jerry Tan",

+       "Ghee Teo",

+       "Dinoop Thomas",

+       "Michael Twomey",

+       "Balamurali Viswanathan",

+       "Deirdre Williams",

+       "Joshua Xia",

+       "Antonio Xu ",

+       "Amith Yamasani",

+       "Ervin Yan",

+       "Mark Yang",

+       "Bolian Yin",

+       "Kyle Yuan",

+       "Pete Zha",

+       "Leon Zhang",

+       "Louie Zhao"

 };

diff -urN gnome-desktop-2.14.1.1/gnome-about/gnome-about.c gnome-desktop-2.14.1.1-hacked/gnome-about/gnome-about.c

--- gnome-desktop-2.14.1.1/gnome-about/gnome-about.c	2006-02-27 13:27:13.000000000 +1300

+++ gnome-desktop-2.14.1.1-hacked/gnome-about/gnome-about.c	2006-04-28 12:31:36.874015000 +1200

@@ -54,6 +54,9 @@

 static char             **introduction_messages = NULL;

 static GnomeCanvasItem   *subheader = NULL;

+static GnomeCanvasItem   *welcome_text = NULL;

+static GnomeCanvasItem   *version_text = NULL;

+static char              *version_string = NULL;

 static gdouble            version_info_height = 0.0;

 static gint               contrib_i = 0;

 static gint              *contrib_order;

@@ -318,7 +321,7 @@

 					       "text", introduction_messages[intro_i],

 						"editable", FALSE,

 					       /* FIXME */

-					       "width", 300.0,

+					       "width", 400.0,

 					       "height", 80.0,

 					       "grow_height", TRUE,

 					       "cursor_visible", FALSE,

@@ -501,6 +504,7 @@

 	const gchar *text;

 	const gchar *url;

+	gboolean is_link;

 } HRefItem;

 static gboolean

 	case GDK_BUTTON_PRESS: {

 		GError *error= NULL;

-		gnome_url_show (href->url, &error);

-		if (error) {

-			char *message;

-

-			message = g_strdup_printf (_("Could not open the address \"%s\": %s"),

-						   href->url, error->message);

-			show_error_dialog (message);

+		if (!href->is_link) {

+			gnome_url_show (href->url, &error);

+			if (error) {

+				char *message;

+

+				message = g_strdup_printf (_("Could not open the address \"%s\": %s"),

+				 			   href->url, error->message);

+				show_error_dialog (message);

-			g_free (message);

-			g_error_free (error);

-		}

+				g_free (message);

+				g_error_free (error);

+			}

+		} else {

+			char *tmp;

+			tmp = g_find_program_in_path (href->url);

+                                                                                                                                                             

+  			if (tmp) {

+    				g_spawn_command_line_async (tmp, &error);

+    				g_free (tmp);

+  			}

+

+			if (error) {

+				char *message;

+				

+				message = g_strdup_printf (_("Could not execute \"%s\": %s"),

+							   href->url, error->message);

+				show_error_dialog (message);

+				g_free (message);

+				g_error_free (error);

+			}

+		}

 		return TRUE;

 	}

 href_item_new (GnomeCanvasGroup *group,

 	       const gchar      *text,

 	       const gchar      *url,

+	       gboolean          is_link,

 	       gdouble          *current_x,

 	       gdouble          *current_y)

 {

 	item = g_new0 (HRefItem, 1);

 	item->text = g_strdup (text);

 	item->url = g_strdup (url);

+	item->is_link = is_link;

 	item->item =

 		gnome_canvas_item_new (group,

 	g_date_set_dmy (date, day, month, year);

-	result = g_new0 (char, 24);

-	g_date_strftime (result, 24, "%x", date);

+	result = g_new0 (char, 30);

+	g_date_strftime (result, 30, "%x", date);

 	g_date_free (date);

 	char *platform = NULL;

 	char *minor = NULL;

 	char *micro = NULL;

+	char *distributor_version_string = NULL;

 	file = gnome_program_locate_file (NULL,

 					  GNOME_FILE_DOMAIN_APP_DATADIR,

 			*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);

 		bits = bits->next;

 		xmlFree (value);

 		*version_string = g_strconcat (platform, ".", minor, NULL);

 	if (!*version_string)

-		*version_string = g_strconcat (platform, ".", minor, ".",

+		*version_string = g_strconcat (platform, " ", minor, ".",

 					       micro, NULL);

 	g_free (platform);

 {

 	char *version_string = NULL;

 	char *distributor_string = NULL;

+	char *distributor_version_string = NULL;

 	char *build_date_string = NULL;

 	char *format = NULL;

 	char *text = NULL;

 	format = g_strdup_printf ("<b>%s</b>%%s", _("%s: "));

-	if (version_string && version_string[0]) {

+	if (distributor_version_string && distributor_version_string[0]) {

+		gdouble tmp;

+

+		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);

+		g_free (text);

+

+		g_object_get (version_text, "text_height", &tmp, NULL);

+		height += tmp + 4.0;

+	}

+	else if (version_string && version_string[0]) {

 		gdouble tmp;

-		GnomeCanvasItem *item;

 		text = g_strdup_printf (format,

 					_("Version"), version_string);

-		item = 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);

+		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);

 		g_free (text);

-		g_object_get (item, "text_height", &tmp, NULL);

+		g_object_get (version_text, "text_height", &tmp, NULL);

 		height += tmp + 4.0;

 	}

 	}

 	g_free (format);

-	g_free (version_string);

 	g_free (distributor_string);

+	g_free (distributor_version_string);

 	g_free (build_date_string);

 	gnome_canvas_item_set (info, "y", canvas_height - height, NULL);

 	GtkWidget *canvas;

 	HRefItem *href;

-	gchar *text;

+	gchar *text, *path;

 	GnomeCanvasItem *item;

 	GnomeCanvasGroup *root;

 	current_y = (gdouble)gdk_pixbuf_get_height (header) + 5.0;

 	href = href_item_new (root,

-			      _("About GNOME"),

-			      "http://www.gnome.org/about/",

+			      _("About JDS"),

+			      "http://www.sun.com/software/javadesktopsystem/",

+			      FALSE,

 			      &current_x, &current_y);

 	/* make a nice guess for the dot delta */

 	/* and more items on a likewise way.

 	 */

 	href = href_item_new (root,

-			      _("News"),

-			      "http://news.gnome.org",

+			      _("About GNOME"),

+			      "http://www.gnome.org/about/",

+			      FALSE,

 			      &current_x, &current_y);

 	item = create_dot (root, &current_x, &current_y, dot_delta);

 	 */

 	href = href_item_new (root,

 			      _("Software"),

-			      "http://www.gnome.org/softwaremap",

+			      "http://www.sun.com/software",

+			      FALSE,

 			      &current_x, &current_y);

 	item = create_dot (root, &current_x, &current_y, dot_delta);

 	href = href_item_new (root,

 			      _("Developers"),

-			      "http://developer.gnome.org/",

-			      &current_x, &current_y);

-	item = create_dot (root, &current_x, &current_y, dot_delta);

-

-	href = href_item_new (root,

-			      _("Friends of GNOME"),

-			      "http://www.gnome.org/friends/",

+			      "http://developers.sun.com/",

+			      FALSE,

 			      &current_x, &current_y);

 	item = create_dot (root, &current_x, &current_y, dot_delta);

 	href = href_item_new (root,

 			      _("Contact"),

-			      "http://www.gnome.org/contact/",

+			      "http://www.sun.com/contact/",

+			      FALSE,

 			      &current_x, &current_y);

+	path = g_find_program_in_path ("bug-buddy");

+

+	if (path != NULL) {

+		item = create_dot (root, &current_x, &current_y, dot_delta);

+		href = href_item_new (root,

+				      _("Report a bug"),

+				      "bug-buddy",

+				      TRUE,

+				      &current_x, &current_y);

+		g_free (path);

+	}

+

 	/* resize */

 	canvas_width = current_x;

+	

+	if (current_x > canvas_width)

+		canvas_width = current_x;

+

 	gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0,

 					canvas_width, canvas_height);

 	gtk_widget_set_size_request (GTK_WIDGET (canvas),

 	points = gnome_canvas_points_new (2);

 	points->coords[0] = 0.0;

 	points->coords[1] = gdk_pixbuf_get_height (header);

-	points->coords[2] = current_x;

+	points->coords[2] = canvas_width;

 	points->coords[3] = gdk_pixbuf_get_height (header);

 	item = gnome_canvas_item_new (root,

 			       "x", (canvas_width - tmp) / 2.0,

 			       NULL);

+	welcome_text = item;

 	text = g_strdup_printf ("<big><b>%s</b></big>",

 				_("Brought to you by:"));

diff -urN gnome-desktop-2.17.2/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.17.2-hacked/gnome-about/gnome-about.desktop.in.in

--- gnome-desktop-2.17.2/gnome-about/gnome-about.desktop.in.in	2006-04-11 00:48:42.000000000 +1200

+++ gnome-desktop-2.17.2-hacked/gnome-about/gnome-about.desktop.in.in	2006-04-28 12:32:33.271037000 +1200

 [Desktop Entry]

 Encoding=UTF-8

-_Name=About GNOME

-_Comment=Learn more about GNOME

+_Name=About Java Desktop System

+_Comment=Learn more about Java Desktop System

 Exec=gnome-about

 Icon=gnome-logo-icon-transparent

 Terminal=false

 Type=Application

-Categories=GNOME;GTK;Application;Core;

+Categories=GNOME;GTK;Application;System;

 OnlyShowIn=GNOME;

 X-GNOME-Bugzilla-Bugzilla=GNOME

 X-GNOME-Bugzilla-Product=gnome-desktop

--- 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])

+AC_ARG_WITH(gnome_distributor_version, [  --with-gnome-distributor-version=DISTRIBUTOR  Specify version of GNOME distributor])

 if test "x$with_gnome_distributor" != x ; then

   GNOME_DISTRIBUTOR=$with_gnome_distributor

 fi

+if test "x$with_gnome_distributor_version" != x ; then

+  GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version