--- a/patches/gnome-desktop-01-jds-about-branding.diff Wed Aug 26 14:35:18 2009 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff Wed Aug 26 15:45:28 2009 +0000
@@ -1,6 +1,7 @@
---- gnome-desktop-2.21.2.old/gnome-about/contributors.list 2007-11-19 17:16:13.948459000 +0000
-+++ gnome-desktop-2.21.2/gnome-about/contributors.list 2007-11-19 17:17:07.507665000 +0000
-@@ -555,3 +555,96 @@
+/jds/bin/diff -uprN gnome-desktop-2.27.91.old/gnome-about/contributors.list gnome-desktop-2.27.91/gnome-about/contributors.list
+--- gnome-desktop-2.27.91.old/gnome-about/contributors.list 2009-08-26 16:52:03.564205000 +0100
++++ gnome-desktop-2.27.91/gnome-about/contributors.list 2009-08-26 16:54:14.870164000 +0100
+@@ -555,3 +555,96 @@ Simon Zheng
Sascha Ziemann
Michael Zucchi
Jason van Zyl
@@ -97,11 +98,11 @@
+Yan Dong Yao
+Yogeesh MB
+Young J. Song
---- gnome-desktop-2.21.2.old/gnome-about/gnome-about.desktop.in.in 2007-11-19 17:16:13.946757000 +0000
-+++ gnome-desktop-2.21.2/gnome-about/gnome-about.desktop.in.in 2007-11-19 17:16:50.784326000 +0000
-@@ -1,7 +1,8 @@
+/jds/bin/diff -uprN gnome-desktop-2.27.91.old/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.27.91/gnome-about/gnome-about.desktop.in.in
+--- gnome-desktop-2.27.91.old/gnome-about/gnome-about.desktop.in.in 2009-08-26 16:52:03.596334000 +0100
++++ gnome-desktop-2.27.91/gnome-about/gnome-about.desktop.in.in 2009-08-26 16:55:00.686659000 +0100
+@@ -1,6 +1,7 @@
[Desktop Entry]
- Encoding=UTF-8
_Name=About GNOME
-_Comment=Learn more about GNOME
+# SUN_BRANDING
@@ -109,38 +110,10 @@
Exec=gnome-about
Icon=gnome-logo-icon-transparent
Terminal=false
---- gnome-desktop-2.26.1/configure.in.ori 2009-04-15 05:09:04.491642625 +0100
-+++ gnome-desktop-2.26.1/configure.in 2009-04-15 05:11:42.008855355 +0100
-@@ -39,12 +39,17 @@
- GNOME_DISTRIBUTOR="GNOME.Org"
- 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
-+fi
-+
- AC_ARG_ENABLE([date-in-gnome-version],
- [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
- [],[enable_date_in_gnome_version=yes])
-@@ -61,6 +66,7 @@
- AC_SUBST(GNOME_MINOR)
- AC_SUBST(GNOME_MICRO)
- AC_SUBST(GNOME_DISTRIBUTOR)
-+AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
- AC_SUBST(GNOME_DATE)
- AC_SUBST(GNOME_DATE_COMMENT_START)
- AC_SUBST(GNOME_DATE_COMMENT_END)
---- gnome-desktop-2.26.1/gnome-about/gnome-about.in.ori 2009-04-15 05:12:19.050569253 +0100
-+++ gnome-desktop-2.26.1/gnome-about/gnome-about.in 2009-04-15 05:23:27.498819963 +0100
-@@ -38,7 +38,7 @@
+/jds/bin/diff -uprN gnome-desktop-2.27.91.old/gnome-about/gnome-about.in gnome-desktop-2.27.91/gnome-about/gnome-about.in
+--- gnome-desktop-2.27.91.old/gnome-about/gnome-about.in 2009-08-26 16:52:03.596777000 +0100
++++ gnome-desktop-2.27.91/gnome-about/gnome-about.in 2009-08-26 17:02:56.398835000 +0100
+@@ -37,7 +37,7 @@ import gtk
import cairo
from math import pi
@@ -149,7 +122,7 @@
import xml.dom.minidom
-@@ -58,11 +58,18 @@
+@@ -57,11 +57,18 @@ LOGO_FILE = "gnome-64.png"
gettext.install (GETTEXT_PACKAGE, LOCALEDIR, unicode = True)
header_links = [
@@ -173,7 +146,20 @@
]
translated_contributors = [
-@@ -544,14 +557,16 @@
+@@ -81,6 +88,12 @@ def locate_file (file):
+ return filename
+ return False
+
++def locate_program (program):
++ for dir in string.split(os.environ['PATH'], os.pathsep):
++ if os.access(os.path.join(dir, program), os.X_OK):
++ return os.path.join(dir, program)
++ return None
++
+ def cleanup_date (date):
+ '''Parse a date as found in gnome-version.xml and nicely format it'''
+ try:
+@@ -543,14 +556,16 @@ class HyperLink (WindowedLabel):
url = ""
menu = None
selection = None
@@ -191,7 +177,28 @@
self.create_menu ()
link_color = self.style_get_property ("link-color")
if not link_color:
-@@ -733,22 +754,33 @@
+@@ -559,10 +574,16 @@ class HyperLink (WindowedLabel):
+
+ def open_url (self, *args):
+ '''Use GNOME API to open the url'''
+- try:
+- gtk.show_uri (self.get_screen(), self.url, 0)
+- except Exception, e:
+- print '''Warning: could not open "%s": %s''' % (self.url, e)
++ if self.is_link != False:
++ try:
++ gnome.url_show (self.url)
++ except Exception, e:
++ print '''Warning: could not open "%s": %s''' % (self.url, e)
++ else:
++ try:
++ os.system (self.url)
++ except Exception, e:
++ print '''Warning: could not launch "%s": %s''' % (self.url, e)
+
+ def copy_url (self, *args):
+ '''Copy URL to Clipboard'''
+@@ -730,22 +751,33 @@ class GnomeAboutHeader (gtk.Layout):
def make_link_widget (link):
'''Helper function which makes an HyperLink and shows it'''
@@ -237,7 +244,7 @@
self.width = current_x + 10
self.height = current_y
-@@ -889,7 +921,7 @@
+@@ -882,7 +914,7 @@ class GnomeAbout (gtk.Dialog):
main_box.pack_start (welcome_label)
descriptions_label = VertAnimatedLabel (self.description_messages,
@@ -246,7 +253,7 @@
DESCRIPTION_DELAY, "%s")
welcome_label.connect ("button-press-event",
descriptions_label.on_button_press)
-@@ -963,6 +995,7 @@
+@@ -956,6 +988,7 @@ contributors list) correctly positionned
"minor" : "",
"micro" : "",
"distributor" : "",
@@ -254,7 +261,7 @@
"date" : ""
}
-@@ -973,15 +1006,19 @@
+@@ -966,15 +999,19 @@ contributors list) correctly positionned
self.load_description_messages (node)
'''Format version'''
@@ -282,47 +289,41 @@
date = cleanup_date (infos["date"])
-diff -ruN gnome-desktop-2.27.5.orig/gnome-about/gnome-about.in gnome-desktop-2.27.5/gnome-about/gnome-about.in
---- gnome-desktop-2.27.5.orig/gnome-about/gnome-about.in 2009-07-29 15:28:24.080979557 +0100
-+++ gnome-desktop-2.27.5/gnome-about/gnome-about.in 2009-07-29 15:32:25.019388568 +0100
-@@ -88,6 +88,12 @@
- return filename
- return False
+/jds/bin/diff -uprN gnome-desktop-2.27.91.old/configure.in gnome-desktop-2.27.91/configure.in
+--- gnome-desktop-2.27.91.old/configure.in 2009-08-26 16:52:03.667194000 +0100
++++ gnome-desktop-2.27.91/configure.in 2009-08-26 16:56:43.460999000 +0100
+@@ -40,12 +40,17 @@ GNOME_MICRO=91
+ GNOME_DISTRIBUTOR="GNOME.Org"
+ GNOME_DATE=`date +"%Y-%m-%d"`
-+def locate_program (program):
-+ for dir in string.split(os.environ['PATH'], os.pathsep):
-+ if os.access(os.path.join(dir, program), os.X_OK):
-+ return os.path.join(dir, program)
-+ return None
-+
- def cleanup_date (date):
- '''Parse a date as found in gnome-version.xml and nicely format it'''
- try:
-@@ -568,10 +574,16 @@
+-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
- def open_url (self, *args):
- '''Use GNOME API to open the url'''
-- try:
-- gtk.show_uri (self.get_screen(), self.url, 0)
-- except Exception, e:
-- print '''Warning: could not open "%s": %s''' % (self.url, e)
-+ if self.is_link != False:
-+ try:
-+ gnome.url_show (self.url)
-+ except Exception, e:
-+ print '''Warning: could not open "%s": %s''' % (self.url, e)
-+ else:
-+ try:
-+ os.system (self.url)
-+ except Exception, e:
-+ print '''Warning: could not launch "%s": %s''' % (self.url, e)
-
- def copy_url (self, *args):
- '''Copy URL to Clipboard'''
-/jds/bin/diff -uprN gnome-desktop-2.27.5.old/Makefile.am gnome-desktop-2.27.5/Makefile.am
---- gnome-desktop-2.27.5.old/Makefile.am 2009-08-21 19:46:37.113555000 +0100
-+++ gnome-desktop-2.27.5/Makefile.am 2009-08-21 19:49:04.385097000 +0100
-@@ -9,17 +9,20 @@ SUBDIRS = \
++if test "x$with_gnome_distributor_version" != x ; then
++ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version
++fi
++
+ AC_ARG_ENABLE([date-in-gnome-version],
+ [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
+ [],[enable_date_in_gnome_version=yes])
+@@ -62,6 +67,7 @@ AC_SUBST(GNOME_PLATFORM)
+ AC_SUBST(GNOME_MINOR)
+ AC_SUBST(GNOME_MICRO)
+ AC_SUBST(GNOME_DISTRIBUTOR)
++AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
+ AC_SUBST(GNOME_DATE)
+ AC_SUBST(GNOME_DATE_COMMENT_START)
+ AC_SUBST(GNOME_DATE_COMMENT_END)
+/jds/bin/diff -uprN gnome-desktop-2.27.91.old/Makefile.am gnome-desktop-2.27.91/Makefile.am
+--- gnome-desktop-2.27.91.old/Makefile.am 2009-08-26 16:52:03.828642000 +0100
++++ gnome-desktop-2.27.91/Makefile.am 2009-08-26 17:04:15.716264000 +0100
+@@ -9,17 +9,21 @@ SUBDIRS = \
docs \
man
@@ -335,9 +336,9 @@
MAINTAINERS \
ChangeLog.pre-git \
- gnome-version.xml.in.in \
-- gnome-version.xml \
-+ $(XML_IN_FILES) \
-+ $(XML_FILES) \
++ $(XML_IN_FILES) \
++ $(XML_FILES) \
+ gnome-version.xml \
COPYING-DOCS \
HACKING \
gnome-doc-utils.make