- updated for 2.8.0.1

Changed files:
    GConf2-NO_MAJOR_VERSION.patch -> 1.5
    GConf2-path.patch -> 1.4

diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch
index e47544658251ac5bbc93b5d1d47e4ba4b8410751..93eaca57e84a23faca08426e21314605d3d9c846 100644 (file)
--- a/GConf2-NO_MAJOR_VERSION.patch
+++ b/GConf2-NO_MAJOR_VERSION.patch
@@ -17,9 +17,9 @@ diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
        -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_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"           \
++      -DGCONF_CONFDIR=\""$(sysgconfdir)"\"            \
+       -DGCONF_ETCDIR=\""$(sysgconfdir)"\"                             \
        -DGCONF_BINDIR=\""$(bindir)"\"                                  \
        -DGCONF_SERVERDIR=\""$(libexecdir)"\"           \
        -DGCONF_BUILDDIR=\""$(top_builddir)"\"                          \
@@ -41,10 +41,10 @@ diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
  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
+-      $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
+-      $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
++      $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)
++      $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path
  
  gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
        @true

diff --git a/GConf2-path.patch b/GConf2-path.patch
index faa0b2040c96e08336465222964037fe78366fe3..4c24f3b693ca2ed5af4da4c62c3410e690841897 100644 (file)
--- a/GConf2-path.patch
+++ b/GConf2-path.patch
@@ -1,6 +1,6 @@
-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
+diff -aurN GConf-2.7.1.orig/gconf/default.path.in GConf-2.7.1/gconf/default.path.in
+--- GConf-2.7.1.orig/gconf/default.path.in     2004-04-01 15:40:29.000000000 +0200
++++ GConf-2.7.1/gconf/default.path.in  2004-06-05 16:06:23.707725104 +0200
 @@ -14,6 +14,9 @@
  # wide sources in this file.
  include @EXPANDED_SYSCONFDIR@/gconf/2/local-mandatory.path
@@ -11,10 +11,11 @@ diff -urN GConf-2.6.1.orig/gconf/default.path.in GConf-2.6.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"
-@@ -28,3 +31,6 @@
- 
+@@ -29,5 +32,5 @@
  # 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