diff -u gcalctool-5.22.2/debian/control.in gcalctool-5.22.2/debian/control.in --- gcalctool-5.22.2/debian/control.in +++ gcalctool-5.22.2/debian/control.in @@ -1,9 +1,10 @@ Source: gcalctool Section: math Priority: optional -Maintainer: Sebastien Bacher +XSBC-Original-Maintainer: Sebastien Bacher +Maintainer: Ubuntu Desktop Team Uploaders: @GNOME_TEAM@ -Build-Depends: cdbs, debhelper (>= 5), libgtk2.0-dev (>= 2.11.6), libgconf2-dev (>= 2.6.1-2), libglade2-dev, scrollkeeper, gnome-pkg-tools (>= 0.10), libxml-parser-perl, flex, bison, gnome-doc-utils (>= 0.3.2) +Build-Depends: cdbs, debhelper (>= 5), libgtk2.0-dev (>= 2.11.6), libgconf2-dev (>=2.6.1-2), scrollkeeper, gnome-pkg-tools (>= 0.10), libxml-parser-perl, flex, bison, gnome-doc-utils (>= 0.3.2), liblaunchpad-integration-dev, libglade2-dev Standards-Version: 3.7.3 Package: gcalctool diff -u gcalctool-5.22.2/debian/control gcalctool-5.22.2/debian/control --- gcalctool-5.22.2/debian/control +++ gcalctool-5.22.2/debian/control @@ -1,9 +1,10 @@ Source: gcalctool Section: math Priority: optional -Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Guilherme de S. Pastore , Loic Minier , Marc 'HE' Brockschmidt , Sebastian Dröge -Build-Depends: cdbs, debhelper (>= 5), libgtk2.0-dev (>= 2.11.6), libgconf2-dev (>= 2.6.1-2), libglade2-dev, scrollkeeper, gnome-pkg-tools (>= 0.10), libxml-parser-perl, flex, bison, gnome-doc-utils (>= 0.3.2) +XSBC-Original-Maintainer: Sebastien Bacher +Maintainer: Ubuntu Desktop Team +Uploaders: Debian GNOME Maintainers , Sebastian Dröge +Build-Depends: cdbs, debhelper (>= 5), libgtk2.0-dev (>= 2.11.6), libgconf2-dev (>=2.6.1-2), scrollkeeper, gnome-pkg-tools (>= 0.10), libxml-parser-perl, flex, bison, gnome-doc-utils (>= 0.3.2), liblaunchpad-integration-dev, libglade2-dev Standards-Version: 3.7.3 Package: gcalctool diff -u gcalctool-5.22.2/debian/changelog gcalctool-5.22.2/debian/changelog --- gcalctool-5.22.2/debian/changelog +++ gcalctool-5.22.2/debian/changelog @@ -1,3 +1,14 @@ +gcalctool (5.22.2-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes (LP: #241303) + - Launchpad integration : + + debian/control.in : Build-Depends on launchpad-integration + + debian/control : Build-Depends on launchpad-integration + + inclusion of debian/patches/01_lpi.patch and + debian/patches/02_autoconf.patch + + -- Christophe Sauthier Thu, 19 Jun 2008 15:38:32 +0200 + gcalctool (5.22.2-1) unstable; urgency=low * New upstream bugfix release. @@ -11,6 +22,73 @@ -- Sebastian Dröge Mon, 07 Apr 2008 19:09:59 +0200 gcalctool (5.22.0-1) unstable; urgency=low +gcalctool (5.22.2-0ubuntu1) hardy-proposed; urgency=low + + * New upstream version (LP: #235741) + - Correct number presentation, once the "Show Thousands Separator" option + is activited. (LP: #189101, #53214, #44756) + - Correctly populate the constant and function menus (LP: #215580) + * Removal of 03_fix_power_interpretation) since it has been incorporated + uptream. + + -- Christophe Sauthier Thu, 29 May 2008 14:01:24 +0200 + +gcalctool (5.22.1-0ubuntu1) hardy; urgency=low + + * New upstream version + - fixes the multiply problem on some keyboards (LP: #212274) + * Removal of the shifting patch (03_shifing_keys) since it is incorporated + upstream. + * Addition of a patch (03_fix_power_interpretation) since it has been + forgotten upstream (LP: #204682) + + -- Christophe Sauthier Tue, 08 Apr 2008 10:18:15 +0200 + +gcalctool (5.22.0-0ubuntu2) hardy; urgency=low + + * Additon of the shifting patch (03_shifing_keys) thanks to Rich Burridge + (fixes LP: #200664) + + -- Christophe Sauthier Mon, 10 Mar 2008 18:33:50 +0100 + +gcalctool (5.22.0-0ubuntu1) hardy; urgency=low + + * New upstream version + - fixes the decimal replaced by 6 problem (LP: #198250) + - fixes memory registers that are save incorrectly (LP: #196181) + + -- Christophe Sauthier Mon, 10 Mar 2008 16:09:39 +0100 + +gcalctool (5.21.92-0ubuntu1) hardy; urgency=low + + * New upstream version + + -- Christophe Sauthier Mon, 25 Feb 2008 23:28:36 +0100 + +gcalctool (5.21.90-0ubuntu1) hardy; urgency=low + + * New upstream version + - Addition of the dependency to libglade + + Modification of the build-dependencies in debian/control.in + - Modification of the patches 01_lpi.patch and 02_autoconf.patch to be + conform with the new version + + -- Christophe Sauthier Thu, 21 Feb 2008 00:33:09 +0100 + +gcalctool (5.20.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #163347) remaining changes: + - debian/patches/01_lpi.patch: + - updated + - debian/patches/02_autoconf.patch: + - updated + - debian/control.in: + - updated Maintainer field + - add liblaunchpad-integration-dev as Build-Depends. + + -- Mario Bonino Sat, 17 Nov 2007 14:56:52 +0100 + +gcalctool (5.20.2-1) unstable; urgency=low * debian/watch: + Update for new location. only in patch2: unchanged: --- gcalctool-5.22.2.orig/debian/patches/01_lpi.patch +++ gcalctool-5.22.2/debian/patches/01_lpi.patch @@ -0,0 +1,32 @@ +diff -Nur gcalctool-5.21.90/configure.in gcalctool-5.21.90.new/configure.in +--- gcalctool-5.21.90/configure.in 2008-01-28 16:13:51.000000000 +0100 ++++ gcalctool-5.21.90.new/configure.in 2008-02-21 22:25:28.000000000 +0100 +@@ -18,7 +18,7 @@ + AC_SUBST(ATK_CFLAGS) + AC_SUBST(ATK_LIBS) + +-pkg_modules="gtk+-2.0 >= 2.11.6 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 libglade-2.0" ++pkg_modules="gtk+-2.0 >= 2.11.6 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 libglade-2.0 launchpad-integration" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) + AC_SUBST(PACKAGE_CFLAGS) + AC_SUBST(PACKAGE_LIBS) +diff -Nur gcalctool-5.21.90/gcalctool/gtk.c gcalctool-5.21.90.new/gcalctool/gtk.c +--- gcalctool-5.21.90/gcalctool/gtk.c 2008-01-25 20:30:09.000000000 +0100 ++++ gcalctool-5.21.90.new/gcalctool/gtk.c 2008-02-21 22:37:07.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "ui.h" + +@@ -2728,6 +2729,8 @@ + set_menubar_tooltip("help_menu"); + set_menubar_tooltip("about_menu"); + ++ launchpad_integration_add_items (gtk_widget_get_parent(GET_WIDGET("help_menu")), -1, TRUE, TRUE); ++ + // ??? + widget = GET_WIDGET("kvbox"); + gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR); only in patch2: unchanged: --- gcalctool-5.22.2.orig/debian/patches/02_autoconf.patch +++ gcalctool-5.22.2/debian/patches/02_autoconf.patch @@ -0,0 +1,12 @@ +diff -Nur gcalctool-5.21.90/configure gcalctool-5.21.90.new/configure +--- gcalctool-5.21.90/configure 2008-01-28 16:15:35.000000000 +0100 ++++ gcalctool-5.21.90.new/configure 2008-02-20 23:55:38.000000000 +0100 +@@ -6367,7 +6367,7 @@ + + + +-pkg_modules="gtk+-2.0 >= 2.11.6 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 libglade-2.0" ++pkg_modules="gtk+-2.0 >= 2.11.6 gobject-2.0 gdk-x11-2.0 glib-2.0 atk gdk-pixbuf-2.0 libglade-2.0 launchpad-integration" + + pkg_failed=no + { echo "$as_me:$LINENO: checking for PACKAGE" >&5