This commit was manufactured by cvs2git to create branch 'unlabeled-1.66.2'.

Sprout from master 2003-12-14 19:14:39 UTC Artur Frysiak <artur@frysiak.net> '- added am18.patch to fix gconf.m4'
Delete:
    GConf2-NO_MAJOR_VERSION.patch
    GConf2-am.patch
    GConf2-path.patch

diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch
deleted file mode 100644 (file)
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 (file)
index 78edd2f..0000000
--- a/GConf2-am.patch
+++ /dev/null
@@ -1,15 +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
-@@ -32,7 +32,8 @@
- libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module
- libgconfbackend_bdb_la_LIBADD = $(DEPENDENT_LIBS) $(BDB_LIBS)
- 
--noinst_PROGRAMS = xml-test
-+#noinst_PROGRAMS = xml-test
-+
-+#xml_test_SOURCES= $(libgconfbackend_xml_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_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la

diff --git a/GConf2-path.patch b/GConf2-path.patch
deleted file mode 100644 (file)
index b0498f3..0000000
--- a/GConf2-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
- 
-+# 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"
-@@ -21,5 +24,6 @@
- # (commented out for now)
- 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
-