Merge lp:~osomon/gconf/merge_3.2.6-4 into lp:~ubuntu-desktop/gconf/ubuntu

[Olivier Tilloy]

Merge from Debian unstable.

[Sebastien Bacher (seb128)]

Thanks & good work! I got slightly confused by the autoreconf rules deleted from debian/rules but it looks like it was a duplicate and the change is right, usually we would mention that in the changelog summary (like a "debian/rules: removed duplicated rules from the Ubuntu delta")

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-30 02:47:37 +0000
+++ debian/changelog	2017-06-08 08:26:26 +0000
@@ -1,3 +1,62 @@
+gconf (3.2.6-4ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable (LP: #1696659). Remaining changes:
+    + don't package the gsettings backend since it's not meant to be
+      distributed
+    + debian/patches/02_xml-gettext-domain.patch: use gettext from schemas
+      translations
+    + debian/patches/05_nodisplay_autostart.patch: don't show in
+      "Startup Applications"
+    + debian/70gconfd_path-on-session, debian/gconf2-common.install: add
+      additional gconf path depending on selected desktop session
+    + debian/gconf-schemas:
+      - convert to python3
+      - encode and decode from UTF-8 to avoid postinst failing when schemas
+        contain non ascii chars
+      - shrink the generated %gconf-tree.xml, by filtering out locale specific
+        defaults for uninstalled locales, leading tabs, empty short
+        descriptions, and mtimes (which aren't interesting for system-wide
+        defaults)
+    + debian/update-gconf-defaults:
+      - convert to python3
+      - encode and decode from UTF-8 to avoid postinst failing when schemas
+        contain non ascii chars
+    + debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
+      declare a new trigger on /usr/share/GConf/gsettings to watch when new
+      gsettings convert files are installed
+    + split gconf-service further into gconf-service and gconf-service-backend,
+      one package being Multi-Arch: foreign and the other Multi-Arch: none, so
+      that we correctly handle the fact that gconf2 needs backend modules of
+      the same arch whereas other reverse-dependencies just need a working
+      daemon
+    + debian/patches/0001-Support-s-to-as-migrations-v2.patch: support 's' to
+      'as' migrations
+    + debian/patches/call-dbus_g_thread_init.patch: Initialize dbus threads
+      before doing anything. This fixes crashes in multithreaded applications
+      that don't use libdbus directly.
+    + debian/patches/pytwonisms.patch: fix gsettings-schema-convert pythonisms
+    + debian/patches/reduce-polling.patch: call the cleanup routine every
+      minute, instead of twice per minute, to reduce wakeups and therefore
+      power usage
+    + debian/rules:
+      - updated for python3
+      - call dh_python3 with --shebang=/usr/bin/python3
+    + debian/{control,control.in}: updated for python3
+
+ -- Olivier Tilloy <[e-mail]>  Thu, 08 Jun 2017 08:53:23 +0200
+
+gconf (3.2.6-4) unstable; urgency=medium
+
+  [ Raphael Geissert ]
+  * update-gconf-defaults: add support for lists of integers (Closes: #833131)
+
+  [ Jeremy Bicha ]
+  * debian/control.in:
+    - Depend on default-dbus-session-bus | dbus-session-bus instead of
+      dbus-x11 (Closes: #835880)
+
+ -- Laurent Bigonville <[e-mail]>  Tue, 11 Oct 2016 17:42:18 +0200
+
 gconf (3.2.6-3ubuntu7) yakkety; urgency=medium
 
   * debian/control.in:

=== modified file 'debian/control'
--- debian/control	2016-09-30 02:47:37 +0000
+++ debian/control	2017-06-08 08:26:26 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Jordi Mallach <[e-mail]>, Josselin Mouette <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                dh-autoreconf,
@@ -30,8 +30,8 @@
 Standards-Version: 3.9.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf/ubuntu
-XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gconf
-XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
+XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gconf
+XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
 XS-Testsuite: autopkgtest
 
 Package: gconf2
@@ -150,11 +150,11 @@
 Section: oldlibs
 Architecture: any
 Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
 Breaks: gconf2 (<< 3.2.3-2)
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libgconf-2-4 (= ${binary:Version}),
-         gconf-service
 Description: GNOME configuration database system (dummy package)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

=== modified file 'debian/control.in'
--- debian/control.in	2016-09-30 02:47:37 +0000
+++ debian/control.in	2017-06-08 08:26:26 +0000
@@ -26,8 +26,8 @@
 Standards-Version: 3.9.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf/ubuntu
-XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gconf
-XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
+XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gconf
+XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
 XS-Testsuite: autopkgtest
 
 Package: gconf2
@@ -146,11 +146,11 @@
 Section: oldlibs
 Architecture: any
 Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
 Breaks: gconf2 (<< 3.2.3-2)
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libgconf-2-4 (= ${binary:Version}),
-         gconf-service
 Description: GNOME configuration database system (dummy package)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

=== modified file 'debian/copyright'
--- debian/copyright	2011-11-22 18:26:35 +0000
+++ debian/copyright	2017-06-08 08:26:26 +0000
@@ -1,7 +1,7 @@
 This package was debianized by  Vincent Renardias <[e-mail]> on
 Fri, 12 May 2000 20:53:21 +0200.
 
-It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/GConf>
+It was downloaded from <https://download.gnome.org/sources/GConf>
 
 Upstream authors:
     Havoc Pennington <[e-mail]>
@@ -33,4 +33,3 @@
 
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL-2'.
-

=== removed file 'debian/default.path.md5sum'
--- debian/default.path.md5sum	2009-05-15 10:26:55 +0000
+++ debian/default.path.md5sum	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-9f90335546f7c57ae6fb552cc2b919c5  2.8.1-6
-65faa85aca651fa9313cb78e0915d392  2.12.0-1

=== modified file 'debian/patches/02_fix_wrong_return_value.patch'
--- debian/patches/02_fix_wrong_return_value.patch	2013-01-23 10:27:59 +0000
+++ debian/patches/02_fix_wrong_return_value.patch	2017-06-08 08:26:26 +0000
@@ -2,11 +2,9 @@
 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=582865
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532119
 
-Index: gconf-3.2.6/gconf/gconf-client.c
-===================================================================
---- gconf-3.2.6.orig/gconf/gconf-client.c	2013-01-23 11:17:01.879020062 +0100
-+++ gconf-3.2.6/gconf/gconf-client.c	2013-01-23 11:17:01.875020063 +0100
-@@ -2373,7 +2373,7 @@
+--- a/gconf/gconf-client.c
++++ b/gconf/gconf-client.c
+@@ -2373,7 +2373,7 @@ gconf_client_lookup (GConfClient *client
        {
          g_free (dir);
          trace ("Negative cache hit on %s", key);
@@ -15,7 +13,7 @@
        }
      else 
        {
-@@ -2389,7 +2389,7 @@
+@@ -2389,7 +2389,7 @@ gconf_client_lookup (GConfClient *client
                {
                  g_free (dir);
                  trace ("Non-existing dir for %s", key);

=== modified file 'debian/patches/25_gconf-path-max-hurd.patch'
--- debian/patches/25_gconf-path-max-hurd.patch	2013-01-23 10:27:59 +0000
+++ debian/patches/25_gconf-path-max-hurd.patch	2017-06-08 08:26:26 +0000
@@ -1,7 +1,5 @@
-Index: gconf-3.2.6/backends/markup-tree.c
-===================================================================
---- gconf-3.2.6.orig/backends/markup-tree.c	2013-01-23 11:17:01.995020067 +0100
-+++ gconf-3.2.6/backends/markup-tree.c	2013-01-23 11:17:01.991020067 +0100
+--- a/backends/markup-tree.c
++++ b/backends/markup-tree.c
 @@ -71,6 +71,11 @@
  }
  #endif
@@ -14,10 +12,8 @@
  typedef struct
  {
    char       *locale;
-Index: gconf-3.2.6/backends/xml-dir.c
-===================================================================
---- gconf-3.2.6.orig/backends/xml-dir.c	2013-01-23 11:17:01.995020067 +0100
-+++ gconf-3.2.6/backends/xml-dir.c	2013-01-23 11:17:01.991020067 +0100
+--- a/backends/xml-dir.c
++++ b/backends/xml-dir.c
 @@ -36,6 +36,11 @@
  
  #include "gconf/gconf-internals.h"

=== modified file 'debian/rules'
--- debian/rules	2016-09-30 02:34:52 +0000
+++ debian/rules	2017-06-08 08:26:26 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/gnome.mk

=== modified file 'debian/update-gconf-defaults'
--- debian/update-gconf-defaults	2016-09-30 02:34:52 +0000
+++ debian/update-gconf-defaults	2017-06-08 08:26:26 +0000
@@ -9,6 +9,8 @@
 import os,tempfile,shutil,sys
 from optparse import OptionParser
 
+import re
+
 parser = OptionParser()
 parser.add_option("--source", dest="source_dir", default="/usr/share/gconf/defaults",
                   help="directory where to find the defaults", metavar="DIR")
@@ -64,13 +66,27 @@
 def string_entry(value):
   return '  <string>' + htmlescape(value) + '</string>\n'
 
+def int_list_entry(value):
+  ret = '  <list type="int">\n'
+  for v in value[1:-1].split(','):
+    ret += '    <value><int>' + v + '</int></value>\n'
+  ret += '  </list>\n'
+  return ret
+
 def list_entry(value):
+  if is_int_list(value):
+    return int_list_entry(value)
   ret = '  <list type="string">\n'
   for v in value[1:-1].split(','):
     ret += '    <value><string>' + htmlescape(v) + '</string></value>\n'
   ret += '  </list>\n'
   return ret
 
+def is_int_list(value):
+  if re.search('^\[(?:\d+,?)+\]$', value) == None:
+    return False
+  else:
+    return True
 
 def listcmp(a,b):
   """Number of starting similar elements in a and b"""

=== modified file 'debian/watch'
--- debian/watch	2012-03-05 23:26:20 +0000
+++ debian/watch	2017-06-08 08:26:26 +0000
@@ -1,2 +1,3 @@
-version=2
-http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.xz
+version=4
+https://download.gnome.org/sources/GConf/([\d\.]+[02468])/ \
+	GConf@ANY_VERSION@\.tar\.xz