patches/gnome-desktop-01-jds-about-branding.diff
changeset 16328 8f73a9ca6508
parent 16170 5eafb6ba5e89
child 16368 0adbf5667f22
--- a/patches/gnome-desktop-01-jds-about-branding.diff	Fri Aug 21 08:26:58 2009 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff	Fri Aug 21 19:11:52 2009 +0000
@@ -282,26 +282,6 @@
  
          date = cleanup_date (infos["date"])
  
-diff -ruN gnome-desktop-2.27.3.orig/Makefile.am gnome-desktop-2.27.3/Makefile.am
---- gnome-desktop-2.27.3.orig/Makefile.am	2009-06-18 15:56:29.385680774 +0100
-+++ gnome-desktop-2.27.3/Makefile.am	2009-06-18 15:57:47.375646382 +0100
-@@ -17,14 +17,12 @@
- EXTRA_DIST =			\
- 	MAINTAINERS		\
- 	ChangeLog.pre-git	\
--	gnome-version.xml.in.in	\
--	gnome-version.xml	\
-+	$(XML_IN_FILES)         \
-+	$(XML_FILES)            \
- 	COPYING-DOCS		\
- 	HACKING			\
- 	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 -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
@@ -339,3 +319,31 @@
  
      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 =			\
+ 	docs			\
+ 	man
+ 
++XML_IN_FILES=gnome-version.xml.in
++XML_FILES=$(XML_IN_FILES:.xml.in=.xml)
++versiondir=$(datadir)/gnome-about
++version_DATA=$(XML_FILES)
++
+ EXTRA_DIST =			\
+ 	MAINTAINERS		\
+ 	ChangeLog.pre-git	\
+-	gnome-version.xml.in.in	\
+-	gnome-version.xml	\
++	$(XML_IN_FILES)         \
++	$(XML_FILES)            \
+ 	COPYING-DOCS		\
+ 	HACKING			\
+ 	gnome-doc-utils.make
+ 
+-versiondir=$(datadir)/gnome-about
+-version_DATA=gnome-version.xml
+ @INTLTOOL_XML_RULE@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper