Mercurial Mercurial > upstream > oracle > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-06-18 Christian Kelly <[email protected]>
authorchrisk
Thu, 18 Jun 2009 15:34:11 +0000
changeset 15945 5d1fde7932fe
parent 15944 6c3e79e954fe
child 15946 e13dfeb50866
2009-06-18 Christian Kelly <[email protected]> * gnome-desktop-01-jds-about-branding.diff: Rework. * base-specs/gnome-desktop.spec: Bump to 2.27.3.
ChangeLog file | annotate | diff | comparison | revisions
base-specs/gnome-desktop.spec file | annotate | diff | comparison | revisions
patches/gnome-desktop-01-jds-about-branding.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu Jun 18 14:45:27 2009 +0000
+++ b/ChangeLog	Thu Jun 18 15:34:11 2009 +0000
@@ -1,3 +1,8 @@
+2009-06-18  Christian Kelly  <[email protected]>
+
+	* gnome-desktop-01-jds-about-branding.diff: Rework.
+	* base-specs/gnome-desktop.spec: Bump to 2.27.3.
+
 2009-06-18  Christian Kelly  <[email protected]>
 
 	* SUNWgnome-doc-utils.spec: Minor pkg'ing fix.
--- a/base-specs/gnome-desktop.spec	Thu Jun 18 14:45:27 2009 +0000
+++ b/base-specs/gnome-desktop.spec	Thu Jun 18 15:34:11 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gnome-desktop
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.26.2
+Version:      2.27.3
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -186,6 +186,9 @@
 %{_libdir}/libgnome-desktop-2.so
 
 %changelog
+* Thu Jun 18 2009 - [email protected]
+- Bump to 2.27.3.
+- Re-work gnome-desktop-01-jds-about-branding.
 * Mon Jun 08 2009 - [email protected]
 - Bump to 2.26.2.  Remove call to libtoolize and add "-I ./m4" to aclocal call
   so the module builds.
--- a/patches/gnome-desktop-01-jds-about-branding.diff	Thu Jun 18 14:45:27 2009 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff	Thu Jun 18 15:34:11 2009 +0000
@@ -1,33 +1,3 @@
---- gnome-desktop-2.21.5.old/Makefile.am	2007-11-19 17:16:14.655547000 +0000
-+++ gnome-desktop-2.21.5/Makefile.am	2007-11-19 17:17:29.263500000 +0000
-@@ -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 	\
-@@ -16,14 +16,12 @@
- 
- EXTRA_DIST =			\
- 	MAINTAINERS		\
--	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
 --- 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 @@
@@ -346,3 +316,23 @@
  
          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
upstream/oracle/spec-files