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

Proposed by Olivier Tilloy on 2017-06-08
Status: Merged
Approved by: Sebastien Bacher on 2017-06-13
Approved revision: 119
Merged at revision: 119
Proposed branch: lp:~osomon/gconf/merge_3.2.6-4
Merge into: lp:~ubuntu-desktop/gconf/ubuntu
Diff against target: 279 lines (+100/-34)
10 files modified
debian/changelog (+59/-0)
debian/control (+7/-7)
debian/control.in (+6/-6)
debian/copyright (+1/-2)
debian/default.path.md5sum (+0/-2)
debian/patches/02_fix_wrong_return_value.patch (+4/-6)
debian/patches/25_gconf-path-max-hurd.patch (+4/-8)
debian/rules (+0/-1)
debian/update-gconf-defaults (+16/-0)
debian/watch (+3/-2)
To merge this branch: bzr merge lp:~osomon/gconf/merge_3.2.6-4
Reviewer Review Type Date Requested Status
Sebastien Bacher 2017-06-08 Approve on 2017-06-13
Review via email: mp+325291@code.launchpad.net

Description of the change

Merge from Debian unstable.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-09-30 02:47:37 +0000
3+++ debian/changelog 2017-06-08 08:26:26 +0000
4@@ -1,3 +1,62 @@
5+gconf (3.2.6-4ubuntu1) UNRELEASED; urgency=low
6+
7+ * Merge from Debian unstable (LP: #1696659). Remaining changes:
8+ + don't package the gsettings backend since it's not meant to be
9+ distributed
10+ + debian/patches/02_xml-gettext-domain.patch: use gettext from schemas
11+ translations
12+ + debian/patches/05_nodisplay_autostart.patch: don't show in
13+ "Startup Applications"
14+ + debian/70gconfd_path-on-session, debian/gconf2-common.install: add
15+ additional gconf path depending on selected desktop session
16+ + debian/gconf-schemas:
17+ - convert to python3
18+ - encode and decode from UTF-8 to avoid postinst failing when schemas
19+ contain non ascii chars
20+ - shrink the generated %gconf-tree.xml, by filtering out locale specific
21+ defaults for uninstalled locales, leading tabs, empty short
22+ descriptions, and mtimes (which aren't interesting for system-wide
23+ defaults)
24+ + debian/update-gconf-defaults:
25+ - convert to python3
26+ - encode and decode from UTF-8 to avoid postinst failing when schemas
27+ contain non ascii chars
28+ + debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
29+ declare a new trigger on /usr/share/GConf/gsettings to watch when new
30+ gsettings convert files are installed
31+ + split gconf-service further into gconf-service and gconf-service-backend,
32+ one package being Multi-Arch: foreign and the other Multi-Arch: none, so
33+ that we correctly handle the fact that gconf2 needs backend modules of
34+ the same arch whereas other reverse-dependencies just need a working
35+ daemon
36+ + debian/patches/0001-Support-s-to-as-migrations-v2.patch: support 's' to
37+ 'as' migrations
38+ + debian/patches/call-dbus_g_thread_init.patch: Initialize dbus threads
39+ before doing anything. This fixes crashes in multithreaded applications
40+ that don't use libdbus directly.
41+ + debian/patches/pytwonisms.patch: fix gsettings-schema-convert pythonisms
42+ + debian/patches/reduce-polling.patch: call the cleanup routine every
43+ minute, instead of twice per minute, to reduce wakeups and therefore
44+ power usage
45+ + debian/rules:
46+ - updated for python3
47+ - call dh_python3 with --shebang=/usr/bin/python3
48+ + debian/{control,control.in}: updated for python3
49+
50+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 08 Jun 2017 08:53:23 +0200
51+
52+gconf (3.2.6-4) unstable; urgency=medium
53+
54+ [ Raphael Geissert ]
55+ * update-gconf-defaults: add support for lists of integers (Closes: #833131)
56+
57+ [ Jeremy Bicha ]
58+ * debian/control.in:
59+ - Depend on default-dbus-session-bus | dbus-session-bus instead of
60+ dbus-x11 (Closes: #835880)
61+
62+ -- Laurent Bigonville <bigon@debian.org> Tue, 11 Oct 2016 17:42:18 +0200
63+
64 gconf (3.2.6-3ubuntu7) yakkety; urgency=medium
65
66 * debian/control.in:
67
68=== modified file 'debian/control'
69--- debian/control 2016-09-30 02:47:37 +0000
70+++ debian/control 2017-06-08 08:26:26 +0000
71@@ -7,7 +7,7 @@
72 Priority: optional
73 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
74 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
75-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
76+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
77 Build-Depends: debhelper (>= 8.1.3),
78 cdbs (>= 0.4.93),
79 dh-autoreconf,
80@@ -30,8 +30,8 @@
81 Standards-Version: 3.9.4
82 Homepage: http://projects.gnome.org/gconf/
83 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf/ubuntu
84-XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gconf
85-XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
86+XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gconf
87+XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
88 XS-Testsuite: autopkgtest
89
90 Package: gconf2
91@@ -150,11 +150,11 @@
92 Section: oldlibs
93 Architecture: any
94 Multi-Arch: same
95+Depends: ${misc:Depends},
96+ ${shlibs:Depends},
97+ libgconf-2-4 (= ${binary:Version}),
98+ gconf-service
99 Breaks: gconf2 (<< 3.2.3-2)
100-Depends: ${misc:Depends},
101- ${shlibs:Depends},
102- libgconf-2-4 (= ${binary:Version}),
103- gconf-service
104 Description: GNOME configuration database system (dummy package)
105 GConf is a configuration database system for storing application
106 preferences. It supports default or mandatory settings set by the
107
108=== modified file 'debian/control.in'
109--- debian/control.in 2016-09-30 02:47:37 +0000
110+++ debian/control.in 2017-06-08 08:26:26 +0000
111@@ -26,8 +26,8 @@
112 Standards-Version: 3.9.4
113 Homepage: http://projects.gnome.org/gconf/
114 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf/ubuntu
115-XS-Debian-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gconf
116-XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
117+XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gconf
118+XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gconf/
119 XS-Testsuite: autopkgtest
120
121 Package: gconf2
122@@ -146,11 +146,11 @@
123 Section: oldlibs
124 Architecture: any
125 Multi-Arch: same
126+Depends: ${misc:Depends},
127+ ${shlibs:Depends},
128+ libgconf-2-4 (= ${binary:Version}),
129+ gconf-service
130 Breaks: gconf2 (<< 3.2.3-2)
131-Depends: ${misc:Depends},
132- ${shlibs:Depends},
133- libgconf-2-4 (= ${binary:Version}),
134- gconf-service
135 Description: GNOME configuration database system (dummy package)
136 GConf is a configuration database system for storing application
137 preferences. It supports default or mandatory settings set by the
138
139=== modified file 'debian/copyright'
140--- debian/copyright 2011-11-22 18:26:35 +0000
141+++ debian/copyright 2017-06-08 08:26:26 +0000
142@@ -1,7 +1,7 @@
143 This package was debianized by Vincent Renardias <vincent@debian.org> on
144 Fri, 12 May 2000 20:53:21 +0200.
145
146-It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/GConf>
147+It was downloaded from <https://download.gnome.org/sources/GConf>
148
149 Upstream authors:
150 Havoc Pennington <hp@redhat.com>
151@@ -33,4 +33,3 @@
152
153 On Debian systems, the complete text of the GNU Lesser General
154 Public License can be found in `/usr/share/common-licenses/LGPL-2'.
155-
156
157=== removed file 'debian/default.path.md5sum'
158--- debian/default.path.md5sum 2009-05-15 10:26:55 +0000
159+++ debian/default.path.md5sum 1970-01-01 00:00:00 +0000
160@@ -1,2 +0,0 @@
161-9f90335546f7c57ae6fb552cc2b919c5 2.8.1-6
162-65faa85aca651fa9313cb78e0915d392 2.12.0-1
163
164=== modified file 'debian/patches/02_fix_wrong_return_value.patch'
165--- debian/patches/02_fix_wrong_return_value.patch 2013-01-23 10:27:59 +0000
166+++ debian/patches/02_fix_wrong_return_value.patch 2017-06-08 08:26:26 +0000
167@@ -2,11 +2,9 @@
168 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=582865
169 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532119
170
171-Index: gconf-3.2.6/gconf/gconf-client.c
172-===================================================================
173---- gconf-3.2.6.orig/gconf/gconf-client.c 2013-01-23 11:17:01.879020062 +0100
174-+++ gconf-3.2.6/gconf/gconf-client.c 2013-01-23 11:17:01.875020063 +0100
175-@@ -2373,7 +2373,7 @@
176+--- a/gconf/gconf-client.c
177++++ b/gconf/gconf-client.c
178+@@ -2373,7 +2373,7 @@ gconf_client_lookup (GConfClient *client
179 {
180 g_free (dir);
181 trace ("Negative cache hit on %s", key);
182@@ -15,7 +13,7 @@
183 }
184 else
185 {
186-@@ -2389,7 +2389,7 @@
187+@@ -2389,7 +2389,7 @@ gconf_client_lookup (GConfClient *client
188 {
189 g_free (dir);
190 trace ("Non-existing dir for %s", key);
191
192=== modified file 'debian/patches/25_gconf-path-max-hurd.patch'
193--- debian/patches/25_gconf-path-max-hurd.patch 2013-01-23 10:27:59 +0000
194+++ debian/patches/25_gconf-path-max-hurd.patch 2017-06-08 08:26:26 +0000
195@@ -1,7 +1,5 @@
196-Index: gconf-3.2.6/backends/markup-tree.c
197-===================================================================
198---- gconf-3.2.6.orig/backends/markup-tree.c 2013-01-23 11:17:01.995020067 +0100
199-+++ gconf-3.2.6/backends/markup-tree.c 2013-01-23 11:17:01.991020067 +0100
200+--- a/backends/markup-tree.c
201++++ b/backends/markup-tree.c
202 @@ -71,6 +71,11 @@
203 }
204 #endif
205@@ -14,10 +12,8 @@
206 typedef struct
207 {
208 char *locale;
209-Index: gconf-3.2.6/backends/xml-dir.c
210-===================================================================
211---- gconf-3.2.6.orig/backends/xml-dir.c 2013-01-23 11:17:01.995020067 +0100
212-+++ gconf-3.2.6/backends/xml-dir.c 2013-01-23 11:17:01.991020067 +0100
213+--- a/backends/xml-dir.c
214++++ b/backends/xml-dir.c
215 @@ -36,6 +36,11 @@
216
217 #include "gconf/gconf-internals.h"
218
219=== modified file 'debian/rules'
220--- debian/rules 2016-09-30 02:34:52 +0000
221+++ debian/rules 2017-06-08 08:26:26 +0000
222@@ -1,6 +1,5 @@
223 #!/usr/bin/make -f
224
225-include /usr/share/cdbs/1/rules/autoreconf.mk
226 include /usr/share/cdbs/1/rules/debhelper.mk
227 include /usr/share/cdbs/1/rules/autoreconf.mk
228 include /usr/share/cdbs/1/class/gnome.mk
229
230=== modified file 'debian/update-gconf-defaults'
231--- debian/update-gconf-defaults 2016-09-30 02:34:52 +0000
232+++ debian/update-gconf-defaults 2017-06-08 08:26:26 +0000
233@@ -9,6 +9,8 @@
234 import os,tempfile,shutil,sys
235 from optparse import OptionParser
236
237+import re
238+
239 parser = OptionParser()
240 parser.add_option("--source", dest="source_dir", default="/usr/share/gconf/defaults",
241 help="directory where to find the defaults", metavar="DIR")
242@@ -64,13 +66,27 @@
243 def string_entry(value):
244 return ' <string>' + htmlescape(value) + '</string>\n'
245
246+def int_list_entry(value):
247+ ret = ' <list type="int">\n'
248+ for v in value[1:-1].split(','):
249+ ret += ' <value><int>' + v + '</int></value>\n'
250+ ret += ' </list>\n'
251+ return ret
252+
253 def list_entry(value):
254+ if is_int_list(value):
255+ return int_list_entry(value)
256 ret = ' <list type="string">\n'
257 for v in value[1:-1].split(','):
258 ret += ' <value><string>' + htmlescape(v) + '</string></value>\n'
259 ret += ' </list>\n'
260 return ret
261
262+def is_int_list(value):
263+ if re.search('^\[(?:\d+,?)+\]$', value) == None:
264+ return False
265+ else:
266+ return True
267
268 def listcmp(a,b):
269 """Number of starting similar elements in a and b"""
270
271=== modified file 'debian/watch'
272--- debian/watch 2012-03-05 23:26:20 +0000
273+++ debian/watch 2017-06-08 08:26:26 +0000
274@@ -1,2 +1,3 @@
275-version=2
276-http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.xz
277+version=4
278+https://download.gnome.org/sources/GConf/([\d\.]+[02468])/ \
279+ GConf@ANY_VERSION@\.tar\.xz

Subscribers

People subscribed via source and target branches