- merged from DEVEL

Changed files:
    GConf2-am.patch -> 1.3
    GConf2-locale-names.patch -> 1.2

diff --git a/GConf2-am.patch b/GConf2-am.patch
index 78edd2f3502b92885477a5daa041385a2d45bbb8..1097b99bd2f1c128d1361f984ad8e1fd2abe109a 100644 (file)
--- a/GConf2-am.patch
+++ b/GConf2-am.patch
@@ -1,15 +1,18 @@
 diff -urN GConf-1.1.9.org/backends/Makefile.am GConf-1.1.9/backends/Makefile.am
 --- GConf-1.1.9.org/backends/Makefile.am       Fri Apr 19 00:22:29 2002
 +++ GConf-1.1.9/backends/Makefile.am   Fri Apr 19 00:35:32 2002
-@@ -32,7 +32,8 @@
- libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module
- libgconfbackend_bdb_la_LIBADD = $(DEPENDENT_LIBS) $(BDB_LIBS)
+@@ -26,10 +26,11 @@
+ libgconfbackend_xml_la_LDFLAGS = -avoid-version -module -no-undefined
+ libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
  
 -noinst_PROGRAMS = xml-test
 +#noinst_PROGRAMS = xml-test
 +
-+#xml_test_SOURCES= $(libgconfbackend_xml_la_SOURCES) xml-test.c
++#xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
 +#xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
  
--xml_test_SOURCES= $(libgconfbackend_xml_la_SOURCES) xml-test.c
+-xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
 -xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
+ 
+ bin_PROGRAMS = gconf-merge-tree
+  

diff --git a/GConf2-locale-names.patch b/GConf2-locale-names.patch
index 3a1c76b9c208322b00e48c4ddd4cebd8f8d11d02..141ab94da7b21b6d42acdc6b689cd138d8eb5445 100644 (file)
--- a/GConf2-locale-names.patch
+++ b/GConf2-locale-names.patch
@@ -1,11 +1,12 @@
---- GConf-2.4.0.1/configure.in.orig    Wed Sep 10 21:23:11 2003
-+++ GConf-2.4.0.1/configure.in Fri Feb 13 11:39:22 2004
+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 @@
  
  AC_CHECK_FUNCS(flockfile)
  
--ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es eu fa fi fr ga gl hi hu id it ja ko 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"
-+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es eu fa fi fr ga gl hi hu id it ja ko lv mk ml mn ms nl nn nb pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW"
+-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"
  
  AM_GLIB_GNU_GETTEXT