Glade

Merge lp:~cyphermox/glade/update-to-3.7.1 into lp:~ubuntu-desktop/glade/ubuntu

  1. update-to-3.7.1
  2. Merge into ubuntu
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~cyphermox/glade/update-to-3.7.1
Merge into: lp:~ubuntu-desktop/glade/ubuntu
Diff against target: 407 lines (+57/-214)
8 files modified
debian/changelog (+17/-0)
debian/control (+10/-8)
debian/control.in (+9/-7)
debian/patches/02_spinbutton-adjustment.patch (+0/-17)
debian/patches/03_fix-vbox-orientation.patch (+0/-166)
debian/patches/04_do_not_escape_utf8.patch (+0/-15)
debian/patches/90_linking_doc_in_natty.patch (+20/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/glade/update-to-3.7.1
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+42318@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Thanks Mathieu!

I've committed the changes to the ~ubuntu-desktop branch, but it will have to wait until after A1 for uploading as this required gnome-media to be rebuilt (main is frozen at the moment).

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 2010-08-30 09:58:06 +0000
3+++ debian/changelog 2010-11-30 22:31:42 +0000
4@@ -1,3 +1,20 @@
5+glade-3 (3.7.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release 3.7.1.
8+ * debian/patches/02_spinbutton-adjustment.patch: dropped, applied upstream.
9+ * debian/patches/03_fix-vbox-orientation.patch: dropped, applied upstream.
10+ * debian/patches/04_do_not_escape_utf8.patch: dropped, applied upstream.
11+ * debian/control.in: Bump libgtk2.0-dev (Build-)Depends to 2.20.0.
12+ * debian/control.in: libgladeui-1-9 becomes libgladeui-1-10 due to SONAME
13+ change.
14+ * debian/libgladeui-1-10.install: renamed from libgladeui-1-9.install.
15+ * debian/rules: update DH_MAKESHLIBS for libgladeui soname change.
16+ * debian/patches/90_linking_doc_in_natty.patch: fix linking for doc scanner
17+ on Natty.
18+ * debian/control: re-applying debian/control.in changes in debian/control.
19+
20+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 22 Nov 2010 22:59:51 -0500
21+
22 glade-3 (3.7.0.is.3.6.7-0ubuntu2) maverick; urgency=low
23
24 * debian/patches/04_do_not_escape_utf8.patch:
25
26=== modified file 'debian/control'
27--- debian/control 2010-04-01 10:18:56 +0000
28+++ debian/control 2010-11-30 22:31:42 +0000
29@@ -8,7 +8,7 @@
30 Priority: optional
31 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
32 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
33-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Deng Xiyue <manphiz-guest@users.alioth.debian.org>, Josselin Mouette <joss@debian.org>
34+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>
35 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/glade-3/ubuntu
36 Build-Depends: cdbs (>= 0.4.41),
37 debhelper (>= 5),
38@@ -21,7 +21,7 @@
39 gnome-common (>= 2.8.0),
40 gnome-pkg-tools (>= 0.10),
41 dpkg-dev (>= 1.13.19),
42- libgtk2.0-dev (>= 2.14.0),
43+ libgtk2.0-dev (>= 2.20.0),
44 python-gtk2-dev (>= 2.10.0),
45 python-support (>= 0.3),
46 gtk-doc-tools (>= 1.9),
47@@ -31,7 +31,7 @@
48 Standards-Version: 3.8.1
49 Homepage: http://glade.gnome.org
50
51-Package: libgladeui-1-9
52+Package: libgladeui-1-10
53 Architecture: any
54 Section: libdevel
55 Depends: ${misc:Depends},
56@@ -42,14 +42,16 @@
57 libgladeui-1-4,
58 libgladeui-1-5,
59 libgladeui-1-7,
60- libgladeui-1-8
61+ libgladeui-1-8,
62+ libgladeui-1-9
63 Replaces: libgladeui-1-1,
64 libgladeui-1-2,
65 libgladeui-1-3,
66 libgladeui-1-4,
67 libgladeui-1-5,
68 libgladeui-1-7,
69- libgladeui-1-8
70+ libgladeui-1-8,
71+ libgladeui-1-9
72 Description: GTK+ User Interface Build core library
73 Glade is a RAD tool to enable quick and easy development of user
74 interfaces for the GTK+ 2 toolkit.
75@@ -66,8 +68,8 @@
76 Architecture: all
77 Section: libdevel
78 Depends: ${misc:Depends},
79- libgladeui-1-9 (>= ${source:Version}),
80- libgtk2.0-dev (>= 2.14.0),
81+ libgladeui-1-10 (>= ${source:Version}),
82+ libgtk2.0-dev (>= 2.20.0),
83 libxml2-dev (>= 2.4.0)
84 Description: GTK+ User Interface Build core library (development files)
85 Glade is a RAD tool to enable quick and easy development of user
86@@ -89,7 +91,7 @@
87 Section: devel
88 Depends: ${misc:Depends},
89 ${shlibs:Depends}
90-Recommends: libgtk2.0-dev (>= 2.14.0),
91+Recommends: libgtk2.0-dev (>= 2.20.0),
92 python-gtk2-dev (>= 2.10.0),
93 libglade2-dev (>= 1:2.6.0),
94 devhelp
95
96=== modified file 'debian/control.in'
97--- debian/control.in 2010-04-01 10:18:56 +0000
98+++ debian/control.in 2010-11-30 22:31:42 +0000
99@@ -16,7 +16,7 @@
100 gnome-common (>= 2.8.0),
101 gnome-pkg-tools (>= 0.10),
102 dpkg-dev (>= 1.13.19),
103- libgtk2.0-dev (>= 2.14.0),
104+ libgtk2.0-dev (>= 2.20.0),
105 python-gtk2-dev (>= 2.10.0),
106 python-support (>= 0.3),
107 gtk-doc-tools (>= 1.9),
108@@ -26,7 +26,7 @@
109 Standards-Version: 3.8.1
110 Homepage: http://glade.gnome.org
111
112-Package: libgladeui-1-9
113+Package: libgladeui-1-10
114 Architecture: any
115 Section: libdevel
116 Depends: ${misc:Depends},
117@@ -37,14 +37,16 @@
118 libgladeui-1-4,
119 libgladeui-1-5,
120 libgladeui-1-7,
121- libgladeui-1-8
122+ libgladeui-1-8,
123+ libgladeui-1-9
124 Replaces: libgladeui-1-1,
125 libgladeui-1-2,
126 libgladeui-1-3,
127 libgladeui-1-4,
128 libgladeui-1-5,
129 libgladeui-1-7,
130- libgladeui-1-8
131+ libgladeui-1-8,
132+ libgladeui-1-9
133 Description: GTK+ User Interface Build core library
134 Glade is a RAD tool to enable quick and easy development of user
135 interfaces for the GTK+ 2 toolkit.
136@@ -61,8 +63,8 @@
137 Architecture: all
138 Section: libdevel
139 Depends: ${misc:Depends},
140- libgladeui-1-9 (>= ${source:Version}),
141- libgtk2.0-dev (>= 2.14.0),
142+ libgladeui-1-10 (>= ${source:Version}),
143+ libgtk2.0-dev (>= 2.20.0),
144 libxml2-dev (>= 2.4.0)
145 Description: GTK+ User Interface Build core library (development files)
146 Glade is a RAD tool to enable quick and easy development of user
147@@ -84,7 +86,7 @@
148 Section: devel
149 Depends: ${misc:Depends},
150 ${shlibs:Depends}
151-Recommends: libgtk2.0-dev (>= 2.14.0),
152+Recommends: libgtk2.0-dev (>= 2.20.0),
153 python-gtk2-dev (>= 2.10.0),
154 libglade2-dev (>= 1:2.6.0),
155 devhelp
156
157=== renamed file 'debian/libgladeui-1-9.install' => 'debian/libgladeui-1-10.install'
158=== removed file 'debian/patches/02_spinbutton-adjustment.patch'
159--- debian/patches/02_spinbutton-adjustment.patch 2010-04-01 10:18:56 +0000
160+++ debian/patches/02_spinbutton-adjustment.patch 1970-01-01 00:00:00 +0000
161@@ -1,17 +0,0 @@
162-#
163-# Description: Set page size to zero for default spinbutton adjustments to avoid warnings
164-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glade-3/+bug/323228
165-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=557851
166-#
167-diff -Nur -x '*.orig' -x '*~' glade-3-3.6.3/plugins/gtk+/gtk+.xml.in glade-3-3.6.3.new/plugins/gtk+/gtk+.xml.in
168---- glade-3-3.6.3/plugins/gtk+/gtk+.xml.in 2009-04-23 00:16:31.000000000 +1000
169-+++ glade-3-3.6.3.new/plugins/gtk+/gtk+.xml.in 2009-04-28 15:43:53.000000000 +1000
170-@@ -1083,7 +1083,7 @@
171- <property id="text" disabled="True"/>
172- <property id="value" disabled="True"/>
173- <property id="can-focus" default="True"/>
174-- <property id="adjustment" default="0 0 100 1 10 10"/>
175-+ <property id="adjustment" default="0 0 100 1 10 0"/>
176- <property id="update-policy">
177- <displayable-values>
178- <value id="GTK_UPDATE_ALWAYS" _name="Always"/>
179
180=== removed file 'debian/patches/03_fix-vbox-orientation.patch'
181--- debian/patches/03_fix-vbox-orientation.patch 2010-04-01 10:18:56 +0000
182+++ debian/patches/03_fix-vbox-orientation.patch 1970-01-01 00:00:00 +0000
183@@ -1,166 +0,0 @@
184-From 9db92b2b0c27420924bf95f4796303b83dfd2929 Mon Sep 17 00:00:00 2001
185-From: Federico Mena Quintero <federico@novell.com>
186-Date: Wed, 24 Mar 2010 14:25:10 -0600
187-Subject: [PATCH 1/1] bgo#594231 - Fix vertical orientation of VBoxes and other vertical widgets
188-
189-We disable the "orientation" property for GtkVBox, GtkHBox, and all
190-the other concrete classes with a default orientation. That property
191-will remain accessible for GtkBox and the other orientable base
192-classes.
193-
194-Signed-off-by: Federico Mena Quintero <federico@novell.com>
195----
196- plugins/gtk+/gtk+.xml.in | 87 +++++++++++++++++++++++++++++++++++----------
197- 1 files changed, 67 insertions(+), 20 deletions(-)
198-
199-diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
200-index d837035..724d488 100644
201---- a/plugins/gtk+/gtk+.xml.in
202-+++ b/plugins/gtk+/gtk+.xml.in
203-@@ -1308,8 +1308,16 @@ embedded in another object</_tooltip>
204-
205- </glade-widget-class>
206-
207-- <glade-widget-class name="GtkHBox" generic-name="hbox" _title="Horizontal Box"/>
208-- <glade-widget-class name="GtkVBox" generic-name="vbox" _title="Vertical Box"/>
209-+ <glade-widget-class name="GtkHBox" generic-name="hbox" _title="Horizontal Box">
210-+ <properties>
211-+ <property id="orientation" disabled="True"/>
212-+ </properties>
213-+ </glade-widget-class>
214-+ <glade-widget-class name="GtkVBox" generic-name="vbox" _title="Vertical Box">
215-+ <properties>
216-+ <property id="orientation" disabled="True"/>
217-+ </properties>
218-+ </glade-widget-class>
219-
220- <glade-widget-class name="GtkTable" generic-name="table" _title="Table" fixed="True">
221- <post-create-function>glade_gtk_table_post_create</post-create-function>
222-@@ -1377,9 +1385,16 @@ embedded in another object</_tooltip>
223- </packing-properties>
224- </glade-widget-class>
225-
226-- <glade-widget-class name="GtkHPaned" generic-name="hpaned" _title="Horizontal Panes"/>
227--
228-- <glade-widget-class name="GtkVPaned" generic-name="vpaned" _title="Vertical Panes"/>
229-+ <glade-widget-class name="GtkHPaned" generic-name="hpaned" _title="Horizontal Panes">
230-+ <properties>
231-+ <property id="orientation" disabled="True"/>
232-+ </properties>
233-+ </glade-widget-class>
234-+ <glade-widget-class name="GtkVPaned" generic-name="vpaned" _title="Vertical Panes">
235-+ <properties>
236-+ <property id="orientation" disabled="True"/>
237-+ </properties>
238-+ </glade-widget-class>
239-
240- <glade-widget-class name="GtkNotebook" generic-name="notebook" _title="Notebook">
241- <post-create-function>glade_gtk_notebook_post_create</post-create-function>
242-@@ -1465,9 +1480,16 @@ embedded in another object</_tooltip>
243- </properties>
244- </glade-widget-class>
245-
246-- <glade-widget-class name="GtkHScale" generic-name="hscale" _title="Horizontal Scale"/>
247--
248-- <glade-widget-class name="GtkVScale" generic-name="vscale" _title="Vertical Scale"/>
249-+ <glade-widget-class name="GtkHScale" generic-name="hscale" _title="Horizontal Scale">
250-+ <properties>
251-+ <property id="orientation" disabled="True"/>
252-+ </properties>
253-+ </glade-widget-class>
254-+ <glade-widget-class name="GtkVScale" generic-name="vscale" _title="Vertical Scale">
255-+ <properties>
256-+ <property id="orientation" disabled="True"/>
257-+ </properties>
258-+ </glade-widget-class>
259-
260- <glade-widget-class name="GtkCalendar" generic-name="calendar" _title="Calendar">
261- <properties>
262-@@ -1497,9 +1519,16 @@ embedded in another object</_tooltip>
263-
264- </glade-widget-class>
265-
266-- <glade-widget-class name="GtkHScrollbar" generic-name="hscrollbar" _title="Horizontal Scrollbar"/>
267--
268-- <glade-widget-class name="GtkVScrollbar" generic-name="vscrollbar" _title="Vertical Scrollbar"/>
269-+ <glade-widget-class name="GtkHScrollbar" generic-name="hscrollbar" _title="Horizontal Scrollbar">
270-+ <properties>
271-+ <property id="orientation" disabled="True"/>
272-+ </properties>
273-+ </glade-widget-class>
274-+ <glade-widget-class name="GtkVScrollbar" generic-name="vscrollbar" _title="Vertical Scrollbar">
275-+ <properties>
276-+ <property id="orientation" disabled="True"/>
277-+ </properties>
278-+ </glade-widget-class>
279-
280- <glade-widget-class name="GtkButtonBox" _title="Button Box">
281- <properties>
282-@@ -1516,27 +1545,38 @@ embedded in another object</_tooltip>
283- </properties>
284- </glade-widget-class>
285-
286-- <glade-widget-class name="GtkHButtonBox" generic-name="hbuttonbox" _title="Horizontal Button Box"/>
287--
288-- <glade-widget-class name="GtkVButtonBox" generic-name="vbuttonbox" _title="Vertical Button Box"/>
289-+ <glade-widget-class name="GtkHButtonBox" generic-name="hbuttonbox" _title="Horizontal Button Box">
290-+ <properties>
291-+ <property id="orientation" disabled="True"/>
292-+ </properties>
293-+ </glade-widget-class>
294-+ <glade-widget-class name="GtkVButtonBox" generic-name="vbuttonbox" _title="Vertical Button Box">
295-+ <properties>
296-+ <property id="orientation" disabled="True"/>
297-+ </properties>
298-+ </glade-widget-class>
299-
300- <glade-widget-class name="GtkHSeparator" generic-name="hseparator" _title="Horizontal Separator">
301--
302-+ <properties>
303-+ <property id="orientation" disabled="True"/>
304-+ </properties>
305- <packing-defaults>
306- <parent-class name="GtkVBox">
307- <child-property id="expand" default="false"/>
308- </parent-class>
309- </packing-defaults>
310--
311- </glade-widget-class>
312--
313- <glade-widget-class name="GtkVSeparator" generic-name="vseparator" _title="Vertical Separator">
314-+ <properties>
315-+ <property id="orientation" disabled="True"/>
316-+ </properties>
317- <packing-defaults>
318- <parent-class name="GtkHBox">
319- <child-property id="expand" default="false"/>
320- </parent-class>
321- </packing-defaults>
322- </glade-widget-class>
323-+
324- <glade-widget-class name="GtkStatusbar" generic-name="statusbar" _title="Status Bar">
325- <properties>
326- <property id="size" disabled="True" />
327-@@ -1740,9 +1780,16 @@ embedded in another object</_tooltip>
328- </properties>
329- </glade-widget-class>
330-
331-- <glade-widget-class name="GtkHRuler" generic-name="hruler" _title="Horizontal Ruler"/>
332--
333-- <glade-widget-class name="GtkVRuler" generic-name="vruler" _title="Vertical Ruler"/>
334-+ <glade-widget-class name="GtkHRuler" generic-name="hruler" _title="Horizontal Ruler">
335-+ <properties>
336-+ <property id="orientation" disabled="True"/>
337-+ </properties>
338-+ </glade-widget-class>
339-+ <glade-widget-class name="GtkVRuler" generic-name="vruler" _title="Vertical Ruler">
340-+ <properties>
341-+ <property id="orientation" disabled="True"/>
342-+ </properties>
343-+ </glade-widget-class>
344-
345- <glade-widget-class name="GtkCombo" generic-name="combo" _title="Combo" deprecated="True" libglade-only="True">
346- <post-create-function>glade_gtk_combo_post_create</post-create-function>
347---
348-1.6.4.2
349-
350
351=== removed file 'debian/patches/04_do_not_escape_utf8.patch'
352--- debian/patches/04_do_not_escape_utf8.patch 2010-08-30 09:58:06 +0000
353+++ debian/patches/04_do_not_escape_utf8.patch 1970-01-01 00:00:00 +0000
354@@ -1,15 +0,0 @@
355-Description: Don't escape utf-8 (no need for that)
356-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=596205
357-Origin: upstream
358-
359---- a/gladeui/glade-xml-utils.c
360-+++ a/gladeui/glade-xml-utils.c
361-@@ -852,7 +852,7 @@ glade_xml_doc_save (GladeXmlDoc *doc_in, const gchar *full_path)
362- xmlDocPtr doc = (xmlDocPtr) doc_in;
363-
364- xmlKeepBlanksDefault (0);
365-- return xmlSaveFormatFile (full_path, doc, 1);
366-+ return xmlSaveFormatFileEnc (full_path, doc, "UTF-8", 1);
367- }
368-
369- void
370
371=== added file 'debian/patches/90_linking_doc_in_natty.patch'
372--- debian/patches/90_linking_doc_in_natty.patch 1970-01-01 00:00:00 +0000
373+++ debian/patches/90_linking_doc_in_natty.patch 2010-11-30 22:31:42 +0000
374@@ -0,0 +1,20 @@
375+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
376+Subject: Fix linking of doc scanner on Natty
377+Last-Update: 2010-11-22
378+
379+The includes from gtk+-2.0 were included in building gladeui-scan.o, but not
380+linked against later. Recitify that by also including the linker flags for
381+gtk+-2.0 in GTKDOC_LIBS.
382+
383+diff -Nur -x '*.orig' -x '*~' glade-3-3.7.1//doc/Makefile.in glade-3-3.7.1.new//doc/Makefile.in
384+--- glade-3-3.7.1//doc/Makefile.in 2010-05-14 18:02:53.000000000 -0400
385++++ glade-3-3.7.1.new//doc/Makefile.in 2010-11-22 22:21:31.014315241 -0500
386+@@ -359,7 +359,7 @@
387+ -I$(top_builddir) \
388+ `pkg-config --cflags gtk+-2.0`
389+
390+-GTKDOC_LIBS = ${top_builddir}/gladeui/libgladeui-1.la
391++GTKDOC_LIBS = ${top_builddir}/gladeui/libgladeui-1.la `pkg-config --libs gtk+-2.0`
392+ @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
393+ @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
394+ @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
395
396=== modified file 'debian/rules'
397--- debian/rules 2009-06-09 06:42:30 +0000
398+++ debian/rules 2010-11-30 22:31:42 +0000
399@@ -13,7 +13,7 @@
400
401 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgladeui-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
402
403-DEB_DH_MAKESHLIBS_ARGS_libgladeui-1-9 += -V 'libgladeui-1-9 (>= 3.6.1)'
404+DEB_DH_MAKESHLIBS_ARGS_libgladeui-1-10 += -V 'libgladeui-1-10 (>= 3.7.1)'
405 DEB_CONFIGURE_EXTRA_FLAGS += \
406 --enable-gtk-doc \
407 --disable-scrollkeeper

Subscribers

People subscribed via source and target branches