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

[Mathieu Trudel-Lapierre]

[Robert Ancell (robert-ancell)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-30 09:58:06 +0000
+++ debian/changelog	2010-11-30 22:31:42 +0000
@@ -1,3 +1,20 @@
+glade-3 (3.7.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release 3.7.1.
+  * debian/patches/02_spinbutton-adjustment.patch: dropped, applied upstream.
+  * debian/patches/03_fix-vbox-orientation.patch: dropped, applied upstream.
+  * debian/patches/04_do_not_escape_utf8.patch: dropped, applied upstream.
+  * debian/control.in: Bump libgtk2.0-dev (Build-)Depends to 2.20.0.
+  * debian/control.in: libgladeui-1-9 becomes libgladeui-1-10 due to SONAME
+    change.
+  * debian/libgladeui-1-10.install: renamed from libgladeui-1-9.install.
+  * debian/rules: update DH_MAKESHLIBS for libgladeui soname change.
+  * debian/patches/90_linking_doc_in_natty.patch: fix linking for doc scanner
+    on Natty.
+  * debian/control: re-applying debian/control.in changes in debian/control.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 22 Nov 2010 22:59:51 -0500
+
 glade-3 (3.7.0.is.3.6.7-0ubuntu2) maverick; urgency=low
 
   * debian/patches/04_do_not_escape_utf8.patch:
 
=== modified file 'debian/control'
--- debian/control	2010-04-01 10:18:56 +0000
+++ debian/control	2010-11-30 22:31:42 +0000
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Deng Xiyue <[e-mail]>, Josselin Mouette <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/glade-3/ubuntu
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
@@ -21,7 +21,7 @@
                gnome-common (>= 2.8.0),
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
-               libgtk2.0-dev (>= 2.14.0),
+               libgtk2.0-dev (>= 2.20.0),
                python-gtk2-dev (>= 2.10.0),
                python-support (>= 0.3),
                gtk-doc-tools (>= 1.9),
@@ -31,7 +31,7 @@
 Standards-Version: 3.8.1
 Homepage: http://glade.gnome.org
 
-Package: libgladeui-1-9
+Package: libgladeui-1-10
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -42,14 +42,16 @@
            libgladeui-1-4,
            libgladeui-1-5,
            libgladeui-1-7,
-           libgladeui-1-8
+           libgladeui-1-8,
+           libgladeui-1-9
 Replaces: libgladeui-1-1,
           libgladeui-1-2,
           libgladeui-1-3,
           libgladeui-1-4,
           libgladeui-1-5,
           libgladeui-1-7,
-          libgladeui-1-8
+          libgladeui-1-8,
+          libgladeui-1-9
 Description: GTK+ User Interface Build core library
  Glade is a RAD tool to enable quick and easy development of user
  interfaces for the GTK+ 2 toolkit.
@@ -66,8 +68,8 @@
 Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
-         libgladeui-1-9 (>= ${source:Version}),
-         libgtk2.0-dev (>= 2.14.0),
+         libgladeui-1-10 (>= ${source:Version}),
+         libgtk2.0-dev (>= 2.20.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)
  Glade is a RAD tool to enable quick and easy development of user
@@ -89,7 +91,7 @@
 Section: devel
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Recommends: libgtk2.0-dev (>= 2.14.0),
+Recommends: libgtk2.0-dev (>= 2.20.0),
             python-gtk2-dev (>= 2.10.0),
             libglade2-dev (>= 1:2.6.0),
             devhelp
 
=== modified file 'debian/control.in'
--- debian/control.in	2010-04-01 10:18:56 +0000
+++ debian/control.in	2010-11-30 22:31:42 +0000
@@ -16,7 +16,7 @@
                gnome-common (>= 2.8.0),
                gnome-pkg-tools (>= 0.10),
                dpkg-dev (>= 1.13.19),
-               libgtk2.0-dev (>= 2.14.0),
+               libgtk2.0-dev (>= 2.20.0),
                python-gtk2-dev (>= 2.10.0),
                python-support (>= 0.3),
                gtk-doc-tools (>= 1.9),
@@ -26,7 +26,7 @@
 Standards-Version: 3.8.1
 Homepage: http://glade.gnome.org
 
-Package: libgladeui-1-9
+Package: libgladeui-1-10
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
@@ -37,14 +37,16 @@
            libgladeui-1-4,
            libgladeui-1-5,
            libgladeui-1-7,
-           libgladeui-1-8
+           libgladeui-1-8,
+           libgladeui-1-9
 Replaces: libgladeui-1-1,
           libgladeui-1-2,
           libgladeui-1-3,
           libgladeui-1-4,
           libgladeui-1-5,
           libgladeui-1-7,
-          libgladeui-1-8
+          libgladeui-1-8,
+          libgladeui-1-9
 Description: GTK+ User Interface Build core library
  Glade is a RAD tool to enable quick and easy development of user
  interfaces for the GTK+ 2 toolkit.
@@ -61,8 +63,8 @@
 Architecture: all
 Section: libdevel
 Depends: ${misc:Depends},
-         libgladeui-1-9 (>= ${source:Version}),
-         libgtk2.0-dev (>= 2.14.0),
+         libgladeui-1-10 (>= ${source:Version}),
+         libgtk2.0-dev (>= 2.20.0),
          libxml2-dev (>= 2.4.0)
 Description: GTK+ User Interface Build core library (development files)
  Glade is a RAD tool to enable quick and easy development of user
@@ -84,7 +86,7 @@
 Section: devel
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Recommends: libgtk2.0-dev (>= 2.14.0),
+Recommends: libgtk2.0-dev (>= 2.20.0),
             python-gtk2-dev (>= 2.10.0),
             libglade2-dev (>= 1:2.6.0),
             devhelp
 
=== renamed file 'debian/libgladeui-1-9.install' => 'debian/libgladeui-1-10.install'
=== removed file 'debian/patches/02_spinbutton-adjustment.patch'
--- debian/patches/02_spinbutton-adjustment.patch	2010-04-01 10:18:56 +0000
+++ debian/patches/02_spinbutton-adjustment.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#
-# Description: Set page size to zero for default spinbutton adjustments to avoid warnings
-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glade-3/+bug/323228
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=557851
-#
-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
---- glade-3-3.6.3/plugins/gtk+/gtk+.xml.in	2009-04-23 00:16:31.000000000 +1000
-+++ glade-3-3.6.3.new/plugins/gtk+/gtk+.xml.in	2009-04-28 15:43:53.000000000 +1000
-@@ -1083,7 +1083,7 @@
-         <property id="text" disabled="True"/>
-         <property id="value" disabled="True"/>
- 	<property id="can-focus" default="True"/>
--        <property id="adjustment" default="0 0 100 1 10 10"/>
-+        <property id="adjustment" default="0 0 100 1 10 0"/>
-         <property id="update-policy">
-   	  <displayable-values>
- 	    <value id="GTK_UPDATE_ALWAYS" _name="Always"/>
 
=== removed file 'debian/patches/03_fix-vbox-orientation.patch'
--- debian/patches/03_fix-vbox-orientation.patch	2010-04-01 10:18:56 +0000
+++ debian/patches/03_fix-vbox-orientation.patch	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-From 9db92b2b0c27420924bf95f4796303b83dfd2929 Mon Sep 17 00:00:00 2001
-From: Federico Mena Quintero <[e-mail]>
-Date: Wed, 24 Mar 2010 14:25:10 -0600
-Subject: [PATCH 1/1] bgo#594231 - Fix vertical orientation of VBoxes and other vertical widgets
-
-We disable the "orientation" property for GtkVBox, GtkHBox, and all
-the other concrete classes with a default orientation.  That property
-will remain accessible for GtkBox and the other orientable base
-classes.
-
-Signed-off-by: Federico Mena Quintero <[e-mail]>
----
- plugins/gtk+/gtk+.xml.in |   87 +++++++++++++++++++++++++++++++++++----------
- 1 files changed, 67 insertions(+), 20 deletions(-)
-
-diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
-index d837035..724d488 100644
---- a/plugins/gtk+/gtk+.xml.in
-+++ b/plugins/gtk+/gtk+.xml.in
-@@ -1308,8 +1308,16 @@ embedded in another object</_tooltip>
- 
-     </glade-widget-class>
- 
--    <glade-widget-class name="GtkHBox" generic-name="hbox" _title="Horizontal Box"/>
--    <glade-widget-class name="GtkVBox" generic-name="vbox" _title="Vertical Box"/>
-+    <glade-widget-class name="GtkHBox" generic-name="hbox" _title="Horizontal Box">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVBox" generic-name="vbox" _title="Vertical Box">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
- 
-     <glade-widget-class name="GtkTable" generic-name="table" _title="Table" fixed="True">
-       <post-create-function>glade_gtk_table_post_create</post-create-function>
-@@ -1377,9 +1385,16 @@ embedded in another object</_tooltip>
-       </packing-properties>
-     </glade-widget-class>
- 
--    <glade-widget-class name="GtkHPaned" generic-name="hpaned" _title="Horizontal Panes"/>
--
--    <glade-widget-class name="GtkVPaned" generic-name="vpaned" _title="Vertical Panes"/>
-+    <glade-widget-class name="GtkHPaned" generic-name="hpaned" _title="Horizontal Panes">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVPaned" generic-name="vpaned" _title="Vertical Panes">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-   
-     <glade-widget-class name="GtkNotebook" generic-name="notebook" _title="Notebook">
-       <post-create-function>glade_gtk_notebook_post_create</post-create-function>
-@@ -1465,9 +1480,16 @@ embedded in another object</_tooltip>
-       </properties>
-     </glade-widget-class>
-     
--    <glade-widget-class name="GtkHScale" generic-name="hscale" _title="Horizontal Scale"/>
--    
--    <glade-widget-class name="GtkVScale" generic-name="vscale" _title="Vertical Scale"/>
-+    <glade-widget-class name="GtkHScale" generic-name="hscale" _title="Horizontal Scale">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVScale" generic-name="vscale" _title="Vertical Scale">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
- 
-     <glade-widget-class name="GtkCalendar" generic-name="calendar" _title="Calendar">
-       <properties>
-@@ -1497,9 +1519,16 @@ embedded in another object</_tooltip>
- 
-     </glade-widget-class>
-     
--    <glade-widget-class name="GtkHScrollbar" generic-name="hscrollbar" _title="Horizontal Scrollbar"/>
--
--    <glade-widget-class name="GtkVScrollbar" generic-name="vscrollbar" _title="Vertical Scrollbar"/>
-+    <glade-widget-class name="GtkHScrollbar" generic-name="hscrollbar" _title="Horizontal Scrollbar">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVScrollbar" generic-name="vscrollbar" _title="Vertical Scrollbar">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
- 
-     <glade-widget-class name="GtkButtonBox" _title="Button Box">
-       <properties>
-@@ -1516,27 +1545,38 @@ embedded in another object</_tooltip>
-       </properties>
-     </glade-widget-class>
-     
--    <glade-widget-class name="GtkHButtonBox" generic-name="hbuttonbox" _title="Horizontal Button Box"/>
--
--    <glade-widget-class name="GtkVButtonBox" generic-name="vbuttonbox" _title="Vertical Button Box"/>
-+    <glade-widget-class name="GtkHButtonBox" generic-name="hbuttonbox" _title="Horizontal Button Box">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVButtonBox" generic-name="vbuttonbox" _title="Vertical Button Box">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
- 
-     <glade-widget-class name="GtkHSeparator" generic-name="hseparator" _title="Horizontal Separator">
--      
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-       <packing-defaults>
- 	<parent-class name="GtkVBox">
- 	  <child-property id="expand" default="false"/>
- 	</parent-class>
-       </packing-defaults>
--
-     </glade-widget-class>
--
-     <glade-widget-class name="GtkVSeparator" generic-name="vseparator" _title="Vertical Separator">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-       <packing-defaults>
- 	<parent-class name="GtkHBox">
- 	  <child-property id="expand" default="false"/>
- 	</parent-class>
-       </packing-defaults>
-     </glade-widget-class>
-+
-     <glade-widget-class name="GtkStatusbar" generic-name="statusbar" _title="Status Bar">
-       <properties>
- 	<property id="size" disabled="True" />
-@@ -1740,9 +1780,16 @@ embedded in another object</_tooltip>
-       </properties>
-     </glade-widget-class>
- 
--    <glade-widget-class name="GtkHRuler" generic-name="hruler" _title="Horizontal Ruler"/>
--    
--    <glade-widget-class name="GtkVRuler" generic-name="vruler" _title="Vertical Ruler"/>
-+    <glade-widget-class name="GtkHRuler" generic-name="hruler" _title="Horizontal Ruler">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
-+    <glade-widget-class name="GtkVRuler" generic-name="vruler" _title="Vertical Ruler">
-+      <properties>
-+	<property id="orientation" disabled="True"/>
-+      </properties>
-+    </glade-widget-class>
- 
-     <glade-widget-class name="GtkCombo" generic-name="combo" _title="Combo" deprecated="True" libglade-only="True">
-       <post-create-function>glade_gtk_combo_post_create</post-create-function>
--- 
-1.6.4.2
-
 
=== removed file 'debian/patches/04_do_not_escape_utf8.patch'
--- debian/patches/04_do_not_escape_utf8.patch	2010-08-30 09:58:06 +0000
+++ debian/patches/04_do_not_escape_utf8.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Don't escape utf-8 (no need for that)
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=596205
-Origin: upstream
-
---- a/gladeui/glade-xml-utils.c	
-+++ a/gladeui/glade-xml-utils.c	
-@@ -852,7 +852,7 @@ glade_xml_doc_save (GladeXmlDoc *doc_in, const gchar *full_path)
- 	xmlDocPtr doc = (xmlDocPtr) doc_in;
- 
- 	xmlKeepBlanksDefault (0);
--	return xmlSaveFormatFile (full_path, doc, 1);
-+	return xmlSaveFormatFileEnc (full_path, doc, "UTF-8", 1);
- }
- 
- void
 
=== added file 'debian/patches/90_linking_doc_in_natty.patch'
--- debian/patches/90_linking_doc_in_natty.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/90_linking_doc_in_natty.patch	2010-11-30 22:31:42 +0000
@@ -0,0 +1,20 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Fix linking of doc scanner on Natty
+Last-Update: 2010-11-22
+
+The includes from gtk+-2.0 were included in building gladeui-scan.o, but not
+linked against later. Recitify that by also including the linker flags for
+gtk+-2.0 in GTKDOC_LIBS.
+
+diff -Nur -x '*.orig' -x '*~' glade-3-3.7.1//doc/Makefile.in glade-3-3.7.1.new//doc/Makefile.in
+--- glade-3-3.7.1//doc/Makefile.in	2010-05-14 18:02:53.000000000 -0400
++++ glade-3-3.7.1.new//doc/Makefile.in	2010-11-22 22:21:31.014315241 -0500
+@@ -359,7 +359,7 @@
+ 	-I$(top_builddir)         \
+ 	`pkg-config --cflags gtk+-2.0`
+ 
+-GTKDOC_LIBS = ${top_builddir}/gladeui/libgladeui-1.la
++GTKDOC_LIBS = ${top_builddir}/gladeui/libgladeui-1.la `pkg-config --libs gtk+-2.0`
+ @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 
=== modified file 'debian/rules'
--- debian/rules	2009-06-09 06:42:30 +0000
+++ debian/rules	2010-11-30 22:31:42 +0000
@@ -13,7 +13,7 @@
 
 SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgladeui-[[:digit:]\.]+-[[:digit:]][[:alnum:]]*)[[:space:]]*$$/\1/p' debian/control)
 
-DEB_DH_MAKESHLIBS_ARGS_libgladeui-1-9 += -V 'libgladeui-1-9 (>= 3.6.1)'
+DEB_DH_MAKESHLIBS_ARGS_libgladeui-1-10 += -V 'libgladeui-1-10 (>= 3.7.1)'
 DEB_CONFIGURE_EXTRA_FLAGS += \
 			--enable-gtk-doc \
 			--disable-scrollkeeper