diff -u glade-2.12.2/debian/patches/00list glade-2.12.2/debian/patches/00list --- glade-2.12.2/debian/patches/00list +++ glade-2.12.2/debian/patches/00list @@ -7 +7,3 @@ -07_build_with_gtk213.dpatch \ No newline at end of file +07_build_with_gtk213.dpatch +08_bonobo_init.dpatch +09_spinbutton_adjustment.dpatch diff -u glade-2.12.2/debian/control glade-2.12.2/debian/control --- glade-2.12.2/debian/control +++ glade-2.12.2/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Gustavo Noronha Silva -Uploaders: Debian GNOME Maintainers , Guilherme de S. Pastore , Gustavo Noronha Silva , Loic Minier +Uploaders: Debian GNOME Maintainers , Gustavo Noronha Silva , Loic Minier Build-Depends: debhelper (>= 4.2.21), dpatch, gettext (>= 0.10.40), libgnomecanvas2-dev (>= 2.0.0), libgnomeui-dev (>= 2.9.0), scrollkeeper (>= 0.1.4), libbonobo2-dev (>= 2.4), libxml2-dev (>= 2.4.1), libgnomedb3-dev, libgnomeprintui2.2-dev, libbonoboui2-dev (>= 2.0.0), autotools-dev, gnome-common (>= 2.8.0), gnome-pkg-tools, dpkg-dev (>= 1.13.19), libgtk2.0-dev (>= 2.8.0), libx11-dev, libgda2-dev (>= 0.90.0) Standards-Version: 3.7.2 diff -u glade-2.12.2/debian/changelog glade-2.12.2/debian/changelog --- glade-2.12.2/debian/changelog +++ glade-2.12.2/debian/changelog @@ -1,3 +1,12 @@ +glade (2.12.2-0ubuntu4~adb1) intrepid; urgency=low + + * debian/patches/08_bonobo_init.dpatch: + - Fix bonobo initialization warning. + * debian/patches/09_spinbutton_adjustment.dpatch: + - Fix spinbutton adjustment warning. (LP: #319655) + + -- Adam Buchbinder Mon, 26 Jan 2009 16:46:13 -0500 + glade (2.12.2-0ubuntu3) intrepid; urgency=low * debian/control.in, debian/control : only in patch2: unchanged: --- glade-2.12.2.orig/debian/patches/09_spinbutton_adjustment.dpatch +++ glade-2.12.2/debian/patches/09_spinbutton_adjustment.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_spinbutton_adjustment.dpatch by Adam Buchbinder +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix spinbutton adjustment warning. (LP: #319655) + +@DPATCH@ +diff -urNad glade-2.12.2~/glade/editor.c glade-2.12.2/glade/editor.c +--- glade-2.12.2~/glade/editor.c 2009-01-27 15:09:05.000000000 -0500 ++++ glade-2.12.2/glade/editor.c 2009-01-27 15:09:24.000000000 -0500 +@@ -361,7 +361,7 @@ + gtk_widget_show (label); + + adjustment = gtk_adjustment_new (editor_grid_horz_spacing, 1, 1000, 1, +- 10, 10); ++ 10, 0); + spinbutton = glade_util_spin_button_new (GTK_OBJECT (dialog), "spinbutton1", + GTK_ADJUSTMENT (adjustment), 0, 0); + gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 3, 0, 1, +@@ -376,7 +376,7 @@ + gtk_widget_show (label); + + adjustment = gtk_adjustment_new (editor_grid_vert_spacing, 1, 1000, 1, +- 10, 10); ++ 10, 0); + spinbutton = glade_util_spin_button_new (GTK_OBJECT (dialog), "spinbutton2", + GTK_ADJUSTMENT (adjustment), 0, 0); + gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 3, 1, 2, +diff -urNad glade-2.12.2~/glade/gbwidgets/gbspinbutton.c glade-2.12.2/glade/gbwidgets/gbspinbutton.c +--- glade-2.12.2~/glade/gbwidgets/gbspinbutton.c 2009-01-27 15:09:05.000000000 -0500 ++++ glade-2.12.2/glade/gbwidgets/gbspinbutton.c 2009-01-27 15:09:24.000000000 -0500 +@@ -75,7 +75,7 @@ + GtkWidget * + gb_spin_button_new (GbWidgetNewData * data) + { +- GtkObject *adjustment = gtk_adjustment_new (1, 0, 100, 1, 10, 10); ++ GtkObject *adjustment = gtk_adjustment_new (1, 0, 100, 1, 10, 0); + return gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); + } + +diff -urNad glade-2.12.2~/glade/property.c glade-2.12.2/glade/property.c +--- glade-2.12.2~/glade/property.c 2009-01-27 15:09:05.000000000 -0500 ++++ glade-2.12.2/glade/property.c 2009-01-27 15:10:06.000000000 -0500 +@@ -2129,7 +2129,7 @@ + gint climb_rate) + { + GtkObject *adjustment = gtk_adjustment_new (min, min, max, step_increment, +- page_increment, page_increment); ++ page_increment, 0); + GtkWidget *value = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), + climb_rate, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (value), TRUE); +@@ -2152,7 +2152,7 @@ + GtkCallback callback) + { + GtkObject *adjustment = gtk_adjustment_new (min, min, max, step_increment, +- page_increment, page_increment); ++ page_increment, 0); + GtkWidget *value = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), + climb_rate, 0); + GtkWidget *dialog_button = gtk_check_button_new (); +@@ -2197,7 +2197,7 @@ + gint decimal_digits) + { + GtkObject *adjustment = gtk_adjustment_new (min, min, max, step_increment, +- page_increment, page_increment); ++ page_increment, 0); + GtkWidget *value = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), + climb_rate, decimal_digits); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (value), TRUE); only in patch2: unchanged: --- glade-2.12.2.orig/debian/patches/08_bonobo_init.dpatch +++ glade-2.12.2/debian/patches/08_bonobo_init.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_bonobo_init.dpatch by Adam Buchbinder +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Deal with "Bonobo-WARNING **: Bonobo must be initialized before use". + +@DPATCH@ +diff -urNad glade-2.12.2~/glade/main.c glade-2.12.2/glade/main.c +--- glade-2.12.2~/glade/main.c 2009-01-26 16:09:15.000000000 -0500 ++++ glade-2.12.2/glade/main.c 2009-01-26 16:12:20.000000000 -0500 +@@ -173,6 +173,9 @@ + putenv (new_modules); + + #ifdef USE_GNOME ++ /* libbonobo complains if we don't initialize it */ ++ bonobo_init(&argc, argv); ++ + /* Gnome sets the locale and parses rc files automatically. */ + program = gnome_program_init ("glade-2", VERSION, + LIBGNOMEUI_MODULE,