- updated for 2.16.0

Changed files:
    GConf2-NO_MAJOR_VERSION.patch -> 1.6
    GConf2-reload.patch -> 1.2

diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch
index 93eaca57e84a23faca08426e21314605d3d9c846..a7aa9f9f26b84081adbc1b87d0240c07dc414dca 100644 (file)
--- a/GConf2-NO_MAJOR_VERSION.patch
+++ b/GConf2-NO_MAJOR_VERSION.patch
@@ -40,14 +40,14 @@ diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
 @@ -122,8 +122,8 @@
  EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
  
- install-data-local:
+ install-data-local: default.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
+ uninstall-local:
+       rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
 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

diff --git a/GConf2-reload.patch b/GConf2-reload.patch
index a7e39fbb3dd632a438b122295150b5f405b76c21..4c83a6b70a135bbabf2bad7a87234654800892fc 100644 (file)
--- a/GConf2-reload.patch
+++ b/GConf2-reload.patch
@@ -5,10 +5,9 @@ retrieving revision 1.102
 diff -d -u -p -U10 -r1.102 gconftool.c
 --- gconf/gconf/gconftool.c    3 Jan 2006 17:05:28 -0000       1.102
 +++ gconf/gconf/gconftool.c    1 Feb 2006 18:34:36 -0000
-@@ -881,32 +881,36 @@ main (int argc, char** argv)
+@@ -881,29 +881,33 @@ main (int argc, char** argv)
    if (makefile_install_mode)
      {
-       const gchar** args = poptGetArgs(ctx);
        gint retval;
  
        umask (022);
@@ -23,7 +22,6 @@ diff -d -u -p -U10 -r1.102 gconftool.c
  
    if (makefile_uninstall_mode)
      {
-       const gchar** args = poptGetArgs(ctx);
        gint retval;
  
        umask (022);
@@ -38,7 +36,6 @@ diff -d -u -p -U10 -r1.102 gconftool.c
  
    if (break_key_mode)
      {
-       const gchar** args = poptGetArgs(ctx);
        gint retval = do_break_key(conf, args);
  
        gconf_engine_unref(conf);