diff -u gcalctool-5.28.1/debian/changelog gcalctool-5.28.1/debian/changelog --- gcalctool-5.28.1/debian/changelog +++ gcalctool-5.28.1/debian/changelog @@ -1,3 +1,13 @@ +gcalctool (5.28.1-0ubuntu2) karmic; urgency=low + + * debian/patches/02_negative_exponential.patch: + - Fix negative exponential numbers (LP: #483730) + * debian/patches/03_trailing_zeroes.patch: + - Only show and use the trailing zeroes option in scientific mode + (LP: #484306) + + -- Robert Ancell Tue, 17 Nov 2009 09:57:10 -0600 + gcalctool (5.28.1-0ubuntu1) karmic; urgency=low * New upstream release: (LP: #455049) only in patch2: unchanged: --- gcalctool-5.28.1.orig/debian/patches/03_trailing_zeroes.patch +++ gcalctool-5.28.1/debian/patches/03_trailing_zeroes.patch @@ -0,0 +1,38 @@ +# +# Description: Only show and use the trailing zeroes option in scientific mode +# Ubuntu: https://bugs.edge.launchpad.net/gcalctool/+bug/484306 +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=600700 +# +diff -Nur -x '*.orig' -x '*~' gcalctool-5.28.1/src/gtk.c gcalctool-5.28.1.new/src/gtk.c +--- gcalctool-5.28.1/src/gtk.c 2009-11-17 10:46:35.000000000 -0600 ++++ gcalctool-5.28.1.new/src/gtk.c 2009-11-17 10:47:12.000000000 -0600 +@@ -1040,9 +1040,8 @@ + if (mode != SCIENTIFIC) { + ui_set_numeric_mode(FIX); + do_button(FN_SET_ACCURACY, DEFAULT_ACCURACY); +- } +- if (mode == BASIC) + ui_set_show_trailing_zeroes(FALSE); ++ } + + ui_make_registers(); + } +@@ -1059,7 +1058,7 @@ + g_object_set(G_OBJECT(X.sci_panel), "visible", mode == SCIENTIFIC, NULL); + g_object_set(G_OBJECT(X.prog_panel), "visible", mode == PROGRAMMING, NULL); + g_object_set(G_OBJECT(X.bit_panel), "visible", mode == PROGRAMMING, NULL); +- gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"), mode == SCIENTIFIC || mode == PROGRAMMING); ++ gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"), mode == SCIENTIFIC); + gtk_widget_set_sensitive(GET_WIDGET("show_registers_menu"), mode != BASIC); + + /* HACK: Some horrible hack down below to keep the buttons the same size. +@@ -1280,8 +1279,7 @@ + gtk_widget_set_sensitive(GET_WIDGET("view_financial_menu"), !v->error); + gtk_widget_set_sensitive(GET_WIDGET("view_scientific_menu"), !v->error); + gtk_widget_set_sensitive(GET_WIDGET("show_trailing_zeroes_menu"), +- !v->error && (X.mode == SCIENTIFIC || +- X.mode == PROGRAMMING)); ++ !v->error && X.mode == SCIENTIFIC); + gtk_widget_set_sensitive(GET_WIDGET("show_thousands_separator_menu"), + !v->error); + gtk_widget_set_sensitive(GET_WIDGET("show_registers_menu"), !v->error); only in patch2: unchanged: --- gcalctool-5.28.1.orig/debian/patches/02_negative_exponential.patch +++ gcalctool-5.28.1/debian/patches/02_negative_exponential.patch @@ -0,0 +1,28 @@ +# +# Description: Fix negative exponential numbers +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gcalctool/+bug/483730 +# Upstream: http://git.gnome.org/cgit/gcalctool/commit/?h=gnome-2-28&id=598c3472e3aeb8f9cd0b22880df64593c1c95f05 +# +diff -Nur -x '*.orig' -x '*~' gcalctool-5.28.1/src/mp-equation-lexer.l gcalctool-5.28.1.new/src/mp-equation-lexer.l +--- gcalctool-5.28.1/src/mp-equation-lexer.l 2009-10-12 19:28:02.000000000 -0500 ++++ gcalctool-5.28.1.new/src/mp-equation-lexer.l 2009-11-17 09:58:52.000000000 -0600 +@@ -83,7 +83,7 @@ + OCT {ZERO}|{ONE}|{TWO}|{THREE}|{FOUR}|{FIVE}|{SIX}|{SEVEN} + DEC {ZERO}|{ONE}|{TWO}|{THREE}|{FOUR}|{FIVE}|{SIX}|{SEVEN}|{EIGHT}|{NINE} + HEX {DEC}|[A-F]|[a-f] +-EXP "e"|"e+"|"e-"|"E"|"E+"|"E-" ++EXP "e"|"e+"|"e-"|"e−"|"E"|"E+"|"E-"|"E−" + SI_SUFFIX "T"|"G"|"M"|"k"|"d"|"c"|"m"|"u"|"µ"|"n"|"p"|"f" + SUPER_DIGITS "⁰"|"¹"|"²"|"³"|"⁴"|"⁵"|"⁶"|"⁷"|"⁸"|"⁹" + SUB_DIGITS "₀"|"₁"|"₂"|"₃"|"₄"|"₅"|"₆"|"₇"|"₈"|"₉" +diff -Nur -x '*.orig' -x '*~' gcalctool-5.28.1/src/unittest.c gcalctool-5.28.1.new/src/unittest.c +--- gcalctool-5.28.1/src/unittest.c 2009-10-12 19:27:11.000000000 -0500 ++++ gcalctool-5.28.1.new/src/unittest.c 2009-11-17 09:59:01.000000000 -0600 +@@ -198,6 +198,7 @@ + test("2e3", "2000", 0); + test("2e+3", "2000", 0); + test("2e-3", "0.002", 0); ++ test("2e−3", "0.002", 0); + test("2×10^3", "2000", 0); + test("2×10^−3", "0.002", 0); +