diff -Nru gconf-3.2.3/debian/changelog gconf-3.2.3/debian/changelog --- gconf-3.2.3/debian/changelog 2012-03-07 20:32:34.000000000 +0000 +++ gconf-3.2.3/debian/changelog 2012-03-07 21:44:50.000000000 +0000 @@ -1,4 +1,4 @@ -gconf (3.2.3-3ubuntu1.2) precise; urgency=low +gconf (3.2.3-3ubuntu1.3) precise; urgency=low * debian/patches/gsettings-data-convert-convert-only-user-settings.patch: - test patch to reduce session login writes diff -Nru gconf-3.2.3/debian/patches/gsettings-data-convert-convert-only-user-settings.patch gconf-3.2.3/debian/patches/gsettings-data-convert-convert-only-user-settings.patch --- gconf-3.2.3/debian/patches/gsettings-data-convert-convert-only-user-settings.patch 2012-03-07 20:32:34.000000000 +0000 +++ gconf-3.2.3/debian/patches/gsettings-data-convert-convert-only-user-settings.patch 2012-03-07 21:44:17.000000000 +0000 @@ -1,22 +1,48 @@ -From deda4c7758d8890b946972d56d68cc19cee01db5 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Wed, 7 Mar 2012 15:04:53 -0500 -Subject: [PATCH] gsettings-data-convert: convert only user settings - -We only want to migrate settings that were in writable databases (in -order to avoid 'lifting' system defaults into the user's database). - -https://bugzilla.gnome.org/show_bug.cgi?id=671581 ---- - gsettings/Makefile.am | 1 + - gsettings/gsettings-data-convert.c | 66 ++++++++++++++++++++++++++++++++++- - 2 files changed, 65 insertions(+), 2 deletions(-) - -diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am -index 8bc9321..8585b1e 100644 ---- a/gsettings/Makefile.am -+++ b/gsettings/Makefile.am -@@ -29,6 +29,7 @@ AM_CPPFLAGS = \ +Index: gconf-3.2.3/gconf/gconf-sources.c +=================================================================== +--- gconf-3.2.3.orig/gconf/gconf-sources.c 2011-07-01 15:01:20.000000000 +0200 ++++ gconf-3.2.3/gconf/gconf-sources.c 2012-03-07 22:44:11.000000000 +0100 +@@ -398,9 +398,7 @@ + { + GList *tmp; + int i; +- gboolean some_writable; + +- some_writable = FALSE; + i = 0; + tmp = sources->sources; + while (tmp != NULL) +@@ -409,7 +407,6 @@ + + if (source->flags & GCONF_SOURCE_ALL_WRITEABLE) + { +- some_writable = TRUE; + gconf_log (GCL_DEBUG, + _("Resolved address \"%s\" to a writable configuration source at position %d"), + source->address, i); +@@ -422,7 +419,6 @@ + } + else + { +- some_writable = TRUE; + gconf_log (GCL_DEBUG, + _("Resolved address \"%s\" to a partially writable configuration source at position %d"), + source->address, i); +@@ -431,9 +427,6 @@ + ++i; + tmp = tmp->next; + } +- +- if (!some_writable) +- gconf_log (GCL_WARNING, _("None of the resolved addresses are writable; saving configuration settings will not be possible")); + } + + return sources; +Index: gconf-3.2.3/gsettings/Makefile.am +=================================================================== +--- gconf-3.2.3.orig/gsettings/Makefile.am 2011-07-01 15:01:20.000000000 +0200 ++++ gconf-3.2.3/gsettings/Makefile.am 2012-03-07 22:44:11.000000000 +0100 +@@ -29,6 +29,7 @@ -I$(top_srcdir) \ -I$(top_builddir) \ -DDATADIR=\"$(datadir)\" \ @@ -24,10 +50,10 @@ $(GSETTINGS_CFLAGS) gsettings_data_convert_SOURCES = gsettings-data-convert.c -diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c -index 595091e..accd105 100644 ---- a/gsettings/gsettings-data-convert.c -+++ b/gsettings/gsettings-data-convert.c +Index: gconf-3.2.3/gsettings/gsettings-data-convert.c +=================================================================== +--- gconf-3.2.3.orig/gsettings/gsettings-data-convert.c 2012-03-07 22:43:50.000000000 +0100 ++++ gconf-3.2.3/gsettings/gsettings-data-convert.c 2012-03-07 22:44:11.000000000 +0100 @@ -27,13 +27,75 @@ #include @@ -105,14 +131,12 @@ static gboolean type_uint32 (GSettings *settings, -@@ -84,7 +146,7 @@ handle_file (const gchar *filename) +@@ -82,7 +144,7 @@ return FALSE; } - client = gconf_client_get_default (); + client = get_writable_client (); - source = g_settings_schema_source_get_default (); groups = g_key_file_get_groups (keyfile, NULL); --- -1.7.9 \ No newline at end of file + for (i = 0; groups[i]; i++) diff -Nru gconf-3.2.3/debian/patches/series gconf-3.2.3/debian/patches/series --- gconf-3.2.3/debian/patches/series 2012-03-07 20:32:34.000000000 +0000 +++ gconf-3.2.3/debian/patches/series 2012-03-07 21:38:01.000000000 +0000 @@ -6,3 +6,4 @@ 05_nodisplay_autostart.patch 06_onlyshowin_unity.patch 25_gconf-path-max-hurd.patch +gsettings-data-convert-convert-only-user-settings.patch