This commit was manufactured by cvs2git to create branch

'unlabeled-1.154.2'.

Sprout from master 2011-07-01 15:48:12 UTC Marcin Banasiak <marcin.banasiak@gmail.com> '- updated to 2.32.5'
Delete:
    GConf2-NO_MAJOR_VERSION.patch
    GConf2-reload.patch

diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch
deleted file mode 100644 (file)
index a509d12..0000000
--- a/GConf2-NO_MAJOR_VERSION.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -urN GConf-2.21.1/backends/Makefile.am GConf-2.21.1.new/backends/Makefile.am
---- GConf-2.21.1/backends/Makefile.am  2007-06-25 13:11:19.000000000 +0200
-+++ GConf-2.21.1.new/backends/Makefile.am      2008-01-09 18:35:59.000000000 +0100
-@@ -2,7 +2,7 @@
-       $(DEPENDENT_WITH_XML_CFLAGS) \
-       -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
- 
--backenddir = $(pkglibdir)/$(MAJOR_VERSION)
-+backenddir = $(pkglibdir)$(MAJOR_VERSION)
- 
- if LDAP_SUPPORT
- EVOLDAP_BACKEND = libgconfbackend-evoldap.la
-diff -urN GConf-2.21.1/gconf/Makefile.am GConf-2.21.1.new/gconf/Makefile.am
---- GConf-2.21.1/gconf/Makefile.am     2007-11-01 20:35:40.000000000 +0100
-+++ GConf-2.21.1.new/gconf/Makefile.am 2008-01-09 18:38:09.000000000 +0100
-@@ -10,12 +10,12 @@
-       -DPREFIX=\""$(prefix)"\"                                        \
-       -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\"                      \
-         -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"                   \
--      -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"           \
-+      -DGCONF_CONFDIR=\""$(sysgconfdir)"\"            \
-       -DGCONF_ETCDIR=\""$(sysgconfdir)"\"                             \
-       -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)$(EXEEXT)"\"                   \
-@@ -60,7 +60,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
-@@ -128,15 +128,15 @@
-               <$(srcdir)/default.path.in >default.path
- 
- install-data-local: default.path
--      $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
--      if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then                         \
-+      $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)
-+      if test -f $(DESTDIR)$(sysgconfdir)/path; then                                          \
-               echo "Existing path configuration file not changed";                            \
-       else                                                                                    \
--              $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path;    \
-+              $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path;                     \
-       fi
- 
- uninstall-local:
--      rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
-+      rm -f $(DESTDIR)$(sysgconfdir)/path
- 
- gconfmarshal.h: gconfmarshal.list $(GLIB_GENMARSHAL)
-       $(GLIB_GENMARSHAL) $< --header --prefix=gconf_marshal > $@
-diff -urN GConf-2.21.1/gconf-2.0.pc.in GConf-2.21.1.new/gconf-2.0.pc.in
---- GConf-2.21.1/gconf-2.0.pc.in       2008-01-08 15:43:09.000000000 +0100
-+++ GConf-2.21.1.new/gconf-2.0.pc.in   2008-01-09 18:38:43.000000000 +0100
-@@ -11,4 +11,4 @@
- Requires: glib
- Requires.private: 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-reload.patch b/GConf2-reload.patch
deleted file mode 100644 (file)
index 4c83a6b..0000000
--- a/GConf2-reload.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: gconf/gconf/gconftool.c
-===================================================================
-RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
-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,29 +881,33 @@ main (int argc, char** argv)
-   if (makefile_install_mode)
-     {
-       gint retval;
- 
-       umask (022);
-       retval = do_makefile_install (conf, args, FALSE);
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
-   if (makefile_uninstall_mode)
-     {
-       gint retval;
- 
-       umask (022);
-       retval = do_makefile_install (conf, args, TRUE);
-       
-       gconf_engine_unref (conf);
-+
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
- 
-       return retval;
-     }
- 
-   if (break_key_mode)
-     {
-       gint retval = do_break_key(conf, args);
- 
-       gconf_engine_unref(conf);