diff -u gbgoffice-1.4/debian/control gbgoffice-1.4/debian/control --- gbgoffice-1.4/debian/control +++ gbgoffice-1.4/debian/control @@ -1,7 +1,8 @@ Source: gbgoffice Section: text Priority: optional -Maintainer: Damyan Ivanov +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Damyan Ivanov Uploaders: George Danchev Build-Depends: debhelper (>= 7.0.50), libsigc++-2.0-dev, libgtkmm-2.4-dev, libglibmm-2.4-dev, imagemagick, quilt(>=0.46-8), desktop-file-utils, diff -u gbgoffice-1.4/debian/changelog gbgoffice-1.4/debian/changelog --- gbgoffice-1.4/debian/changelog +++ gbgoffice-1.4/debian/changelog @@ -1,3 +1,11 @@ +gbgoffice (1.4-5ubuntu1) lucid; urgency=low + + * Sync on debian LP: #503789 + * Fix Invalid conversion error and hence FTBFS. Thanks to Ilya Barygin + for the patch. + + -- Bhavani Shankar Thu, 07 Jan 2010 22:27:15 +0530 + gbgoffice (1.4-5) unstable; urgency=low * Acknowledge NMU. Thanks gregor! diff -u gbgoffice-1.4/debian/patches/series gbgoffice-1.4/debian/patches/series --- gbgoffice-1.4/debian/patches/series +++ gbgoffice-1.4/debian/patches/series @@ -6,0 +7 @@ +09_gtkmm2.19.patch only in patch2: unchanged: --- gbgoffice-1.4.orig/debian/patches/09_gtkmm2.19.patch +++ gbgoffice-1.4/debian/patches/09_gtkmm2.19.patch @@ -0,0 +1,14 @@ +Index: gbgoffice-1.4/src/workhelper.cpp +=================================================================== +--- gbgoffice-1.4.orig/src/workhelper.cpp 2010-01-07 19:05:08.000000000 +0300 ++++ gbgoffice-1.4/src/workhelper.cpp 2010-01-07 19:05:29.000000000 +0300 +@@ -39,7 +39,7 @@ + //set_resize_mode(Gtk::RESIZE_PARENT); + set_reallocate_redraws(true); + +- Gtk::HButtonBox *hba = get_action_area(); ++ Gtk::ButtonBox *hba = get_action_area(); + + add_events(Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK); + +