- up for version 2.6.1

Changed files:
    GConf2-locale-names.patch -> 1.3
    GConf2-path.patch -> 1.3

diff --git a/GConf2-locale-names.patch b/GConf2-locale-names.patch
index 141ab94da7b21b6d42acdc6b689cd138d8eb5445..3422a1d8f41e08fb88ae6d99557b604fb3d08a5d 100644 (file)
--- a/GConf2-locale-names.patch
+++ b/GConf2-locale-names.patch
@@ -1,12 +1,12 @@
-diff -urN GConf-2.5.90.orig/configure.in GConf-2.5.90/configure.in
---- GConf-2.5.90.orig/configure.in     2004-02-24 19:33:03.612150704 +0100
-+++ GConf-2.5.90/configure.in  2004-02-24 19:33:39.171744824 +0100
-@@ -216,7 +216,7 @@
+diff -urN GConf-2.6.1.orig/configure.in GConf-2.6.1/configure.in
+--- GConf-2.6.1.orig/configure.in      2004-04-19 23:32:25.698204600 +0200
++++ GConf-2.6.1/configure.in   2004-04-19 23:36:22.654181816 +0200
+@@ -230,7 +230,7 @@
  
  AC_CHECK_FUNCS(flockfile)
  
--ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
-+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml mn ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
+-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es eu fa fi fr ga gl gu hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
++ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es eu fa fi fr ga gl gu hi hr hu id it ja ko lt lv mk ml mn ms nb nl nn pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
  
  AM_GLIB_GNU_GETTEXT
  

diff --git a/GConf2-path.patch b/GConf2-path.patch
index b0498f31279d7d6fdf97b35eba570b08a8df129c..faa0b2040c96e08336465222964037fe78366fe3 100644 (file)
--- a/GConf2-path.patch
+++ b/GConf2-path.patch
@@ -1,9 +1,9 @@
-diff -urN GConf-1.2.1.orig/gconf/default.path.in GConf-1.2.1/gconf/default.path.in
---- GConf-1.2.1.orig/gconf/default.path.in     Fri Oct 18 23:46:43 2002
-+++ GConf-1.2.1/gconf/default.path.in  Fri Oct 18 23:49:06 2002
-@@ -9,6 +9,9 @@
- # (commented out until xml backend knows how to be read-only for users)
- xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
+diff -urN GConf-2.6.1.orig/gconf/default.path.in GConf-2.6.1/gconf/default.path.in
+--- GConf-2.6.1.orig/gconf/default.path.in     2004-04-19 23:32:25.705203536 +0200
++++ GConf-2.6.1/gconf/default.path.in  2004-04-19 23:34:51.734003784 +0200
+@@ -14,6 +14,9 @@
+ # wide sources in this file.
+ include @EXPANDED_SYSCONFDIR@/gconf/2/local-mandatory.path
  
 +# Uncomment line below if GConf 1 is installed
 +# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.mandatory
@@ -11,11 +11,10 @@ diff -urN GConf-1.2.1.orig/gconf/default.path.in GConf-1.2.1/gconf/default.path.
  # Now see where users want us to look - basically the user can stick arbitrary 
  # sources in a ~/.gconf.path file and they're inserted here
  include "$(HOME)/.gconf.path"
-@@ -21,5 +24,6 @@
- # (commented out for now)
- xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
+@@ -28,3 +31,6 @@
  
--
+ # Finally, look at the systemwide defaults
+ xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
++
 +# Uncomment line below if GConf 1 is installed
 +# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.defaults
-