From 53ff04e5015395b722f19f70ef2d860cbbc636eb Mon Sep 17 00:00:00 2001 From: cvs2git Date: Mon, 19 Apr 2004 21:44:06 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'unlabeled-1.70.2'. Sprout from master 2004-04-19 21:44:06 UTC aflinta '- up to version 2.6.1' Delete: GConf2-NO_MAJOR_VERSION.patch GConf2-am.patch GConf2-locale-names.patch GConf2-path.patch --- GConf2-NO_MAJOR_VERSION.patch | 59 ----------------------------------- GConf2-am.patch | 18 ----------- GConf2-locale-names.patch | 12 ------- GConf2-path.patch | 20 ------------ 4 files changed, 109 deletions(-) delete mode 100644 GConf2-NO_MAJOR_VERSION.patch delete mode 100644 GConf2-am.patch delete mode 100644 GConf2-locale-names.patch delete mode 100644 GConf2-path.patch diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch deleted file mode 100644 index e475446..0000000 --- a/GConf2-NO_MAJOR_VERSION.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Nur GConf-1.2.1/backends/Makefile.am GConf-1.2.1.new/backends/Makefile.am ---- GConf-1.2.1/backends/Makefile.am Wed Jun 12 22:32:12 2002 -+++ GConf-1.2.1.new/backends/Makefile.am Thu Aug 15 02:19:08 2002 -@@ -4,7 +4,7 @@ - - EXTRA_DIST=README.bdb - --backenddir = $(pkglibdir)/$(MAJOR_VERSION) -+backenddir = $(pkglibdir)$(MAJOR_VERSION) - - if BDB - BDBBACKEND=libgconfbackend-bdb.la -diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am ---- GConf-1.2.1/gconf/Makefile.am Tue Jul 23 19:14:07 2002 -+++ GConf-1.2.1.new/gconf/Makefile.am Thu Aug 15 02:21:59 2002 -@@ -9,12 +9,12 @@ - -DG_LOG_DOMAIN=\"GConf\" \ - -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \ - -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \ -- -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \ -+ -DGCONF_CONFDIR=\""$(sysconfdir)/gconf"\" \ - -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ - -DGCONF_BINDIR=\""$(bindir)"\" \ - -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ - -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ -- -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ -+ -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\" \ - -DVERSION=\""$(VERSION)"\" \ - -DGCONF_ENABLE_INTERNALS=1 \ - -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \ -@@ -63,7 +63,7 @@ - gconf-engine.h \ - gconf-client.h - --gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf -+gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf - gconfinclude_HEADERS = \ - $(gconf_headers) \ - gconf-enum-types.h -@@ -122,8 +122,8 @@ - EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh - - install-data-local: -- -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION) -- $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path -+ -mkdir -p $(DESTDIR)$(sysconfdir)/gconf -+ $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/path - - gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h - @true -diff -Nur GConf-1.2.1/gconf-2.0.pc.in GConf-1.2.1.new/gconf-2.0.pc.in ---- GConf-1.2.1/gconf-2.0.pc.in Tue Jul 23 19:14:07 2002 -+++ GConf-1.2.1.new/gconf-2.0.pc.in Thu Aug 15 02:19:08 2002 -@@ -10,4 +10,4 @@ - Version: @VERSION@ - Requires: ORBit-2.0 - Libs: -L${libdir} -lgconf-@MAJOR_VERSION@ --Cflags: -I${includedir}/gconf/@MAJOR_VERSION@ -+Cflags: -I${includedir}/gconf@MAJOR_VERSION@ diff --git a/GConf2-am.patch b/GConf2-am.patch deleted file mode 100644 index 1097b99..0000000 --- a/GConf2-am.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 -@@ -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_oldxml_la_SOURCES) xml-test.c -+#xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la - --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 deleted file mode 100644 index 3422a1d..0000000 --- a/GConf2-locale-names.patch +++ /dev/null @@ -1,12 +0,0 @@ -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_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 deleted file mode 100644 index faa0b20..0000000 --- a/GConf2-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 -+ - # 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" -@@ -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 -- 2.44.0