r12309 - in /desktop/unstable/gcalctool/debian: changelog patches/01_storage-register-data-loss.patch patches/02_desktop-file.patch rules

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Aug 10 10:00:01 2007
New Revision: 12309

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12309
Log:
* debian/patches/01_storage-register-data-loss.patch:
  + Don't lose negative numbers in the storage registers. Patch
    from upstream SVN. (Closes: #423946)
* debian/rules:
  + Clean up properly after build. (Closes: #424305)
* debian/patches/02_desktop-file.patch:
  + Use the correct name for the icon according to the icon spec. Patch
    more or less from upstream but we want to show gcalctool not only
    in Gnome. (Closes: #431356)

Added:
    desktop/unstable/gcalctool/debian/patches/01_storage-register-data-loss.patch
    desktop/unstable/gcalctool/debian/patches/02_desktop-file.patch
Modified:
    desktop/unstable/gcalctool/debian/changelog
    desktop/unstable/gcalctool/debian/rules

Modified: desktop/unstable/gcalctool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/changelog?rev=12309&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/changelog (original)
+++ desktop/unstable/gcalctool/debian/changelog Fri Aug 10 10:00:01 2007
@@ -1,3 +1,17 @@
+gcalctool (5.9.14-3) unstable; urgency=low
+
+  * debian/patches/01_storage-register-data-loss.patch:
+    + Don't lose negative numbers in the storage registers. Patch
+      from upstream SVN. (Closes: #423946)
+  * debian/rules:
+    + Clean up properly after build. (Closes: #424305)
+  * debian/patches/02_desktop-file.patch:
+    + Use the correct name for the icon according to the icon spec. Patch
+      more or less from upstream but we want to show gcalctool not only
+      in Gnome. (Closes: #431356)
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 10 Aug 2007 11:41:09 +0200
+
 gcalctool (5.9.14-2) unstable; urgency=low
 
   [ Loic Minier ]

Added: desktop/unstable/gcalctool/debian/patches/01_storage-register-data-loss.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/patches/01_storage-register-data-loss.patch?rev=12309&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/patches/01_storage-register-data-loss.patch (added)
+++ desktop/unstable/gcalctool/debian/patches/01_storage-register-data-loss.patch Fri Aug 10 10:00:01 2007
@@ -1,0 +1,42 @@
+Index: gcalctool/display.c
+===================================================================
+--- gcalctool/display.c	(revision 1586)
++++ gcalctool/display.c	(working copy)
+@@ -400,6 +400,7 @@
+     int i, inum;
+     int exp      = 0;
+     int exp_sign = 1;
++    int negate = 0;
+     char *lnp = get_localized_numeric_point();
+     assert(lnp);
+ 
+@@ -408,6 +409,18 @@
+     mpcim(&basevals[(int) base], MPbase);
+ 
+     optr = str;
++
++    /* Remove any initial spaces or tabs. */
++    while (*optr == ' ' || *optr == '\t') {
++        optr++;
++    }
++
++    /* Check if this is a negative number. */
++    if (*optr == '-') {
++        negate = 1;
++        optr++;
++    }
++
+     while ((inum = char_val(*optr)) >= 0) {
+         mpmul(MPval, MPbase, MPval);
+         mpaddi(MPval, &inum, MPval);
+@@ -444,6 +457,10 @@
+         mppwr(MPbase, &exp, MP1);
+         mpmul(MPval, MP1, MPval);
+     }
++
++    if (negate == 1) {
++        mpneg(MPval, MPval);
++    }
+ }
+ 
+ 

Added: desktop/unstable/gcalctool/debian/patches/02_desktop-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/patches/02_desktop-file.patch?rev=12309&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/patches/02_desktop-file.patch (added)
+++ desktop/unstable/gcalctool/debian/patches/02_desktop-file.patch Fri Aug 10 10:00:01 2007
@@ -1,0 +1,14 @@
+Index: gcalctool.desktop.in
+===================================================================
+--- gcalctool.desktop.in	(revision 1552)
++++ gcalctool.desktop.in	(working copy)
+@@ -3,7 +3,8 @@
+ _Name=Calculator
+ _Comment=Perform calculations
+ Exec=gcalctool
+-Icon=gnome-calculator
++Icon=accessories-calculator
++OnlyShowIn=GNOME;
+ Terminal=false
+ Type=Application
+ StartupNotify=true

Modified: desktop/unstable/gcalctool/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/rules?rev=12309&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/rules (original)
+++ desktop/unstable/gcalctool/debian/rules Fri Aug 10 10:00:01 2007
@@ -16,3 +16,7 @@
 	cp debian/gcalctool.xpm debian/gcalctool/usr/share/pixmaps/gcalctool.xpm
 binary-post-install/gcalctool::
 	rm -rf debian/gcalctool/var
+
+clean::
+	rm -f gcalctool/libparser.a
+