[Pkg-wmaker-commits] [wmcalc] 07/65: Imported Debian patch 0.3-5

Sun Aug 23 13:54:00 UTC 2015

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcalc.

commit 68456a45ed63a0b22f5f5e79bb72a0c14f115122
Author: Sandro Tosi <matrixhasu at gmail.com>
Date:   Mon Jan 21 23:27:20 2008 +0100

    Imported Debian patch 0.3-5
---
 debian/changelog                                   | 21 +++++++++--
 debian/control                                     |  2 +-
 debian/copyright                                   | 10 ++++--
 debian/menu                                        |  2 +-
 debian/patches/00list                              |  1 +
 ...0_bts-320597_increase_significant_digits.dpatch | 41 ++++++++++++++++++++++
 debian/wmcalc.1                                    |  3 +-
 7 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf964c5..1caba9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+wmcalc (0.3-5) unstable; urgency=low
+
+  * debian/control
+    - bump Standards-Version to 3.7.3
+  * debian/menu
+    - updated to new menu policy
+  * debian/copyright
+    - upstream author and copyright indented with 4 spaces
+    - local license text now points to the generic GPL symlink
+  * debian/patches/10_bts-320597_increase_significant_digits.dpatch
+    - added to increase significant digits in calculations; thanks to Antony
+      Gelberg (Closes: #320597)
+  * debian/wmcalc.1
+    - added a note about improper operations execution order (Closes: #404701)
+    - minus signs escaped (lintian warning)
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Mon, 21 Jan 2008 23:27:20 +0100
+
 wmcalc (0.3-4) unstable; urgency=low
 
   * Adopting package (Closes: #427132)
@@ -73,6 +91,3 @@ wmcalc (0.3-1) unstable; urgency=low
 
  -- Gordon Fraser <gordon at freakzone.net>  Wed, 19 Sep 2001 21:33:45 +0200
 
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index 164df2d..8bc54c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Sandro Tosi <matrixhasu at gmail.com>
 Build-Depends: debhelper (>> 5), libx11-dev, libxext-dev, libxpm-dev, x-dev, dpatch
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: wmcalc
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index a713696..cd1f1ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,13 @@ It is now maintained by Sandro Tosi <matrixhasu at gmail.com>
 
 It was downloaded from http://members.access1.net/ehflora/
 
-Upstream Author: Edward H. Flora <ehflora at access1.net>
+Upstream Author:
 
-Copyright: 1998-2001 Edward H. Flora
+    Edward H. Flora <ehflora at access1.net>
+
+Copyright:
+
+    Copyright 1998-2001 Edward H. Flora
 
 License:
 
@@ -27,4 +31,4 @@ License:
     MA 02110-1301, USA.
 
 On a Debian system the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL-2'
+can be found in the file `/usr/share/common-licenses/GPL'
diff --git a/debian/menu b/debian/menu
index bb41277..b4bb557 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(wmcalc):needs="X11" section="Applications/Tools" hints="Dockapp,Desktop"\
+?package(wmcalc):needs="X11" section="Applications/Science/Mathematics" hints="Dockapp,Desktop"\
   title="wmcalc" command="/usr/bin/wmcalc"
diff --git a/debian/patches/00list b/debian/patches/00list
index 719f955..356a5f5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01_restore_pristine_code.dpatch
+10_bts-320597_increase_significant_digits
diff --git a/debian/patches/10_bts-320597_increase_significant_digits.dpatch b/debian/patches/10_bts-320597_increase_significant_digits.dpatch
new file mode 100644
index 0000000..76d02b2
--- /dev/null
+++ b/debian/patches/10_bts-320597_increase_significant_digits.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_bts-320597_increase_significant_digits.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## DP: Increase significant digits, thanks to Antony Gelberg <antony at wayforth.co.uk>
+
+ at DPATCH@
+diff -urNad wmcalc~/wmcalcfunc.c wmcalc/wmcalcfunc.c
+--- wmcalc~/wmcalcfunc.c	2000-11-10 02:01:18.000000000 +0100
++++ wmcalc/wmcalcfunc.c	2008-01-06 18:41:14.694050978 +0100
+@@ -17,6 +17,7 @@
+     Change History:
+     Date       Modification
+     11/03/00   File Header added
++    27/12/06   Increased significant digits (Antony Gelberg, antony at wayforth.co.uk)
+  
+  ****************************************************************/
+ 
+@@ -382,19 +383,19 @@
+   switch (OpFlag) {
+   case '+':
+     RegisterA = RegisterB + RegisterA;
+-    sprintf(DispString, "%10.5g", RegisterA);
++    sprintf(DispString, "%10.10g", RegisterA);
+     break;
+   case '-':
+     RegisterA = RegisterB - RegisterA;
+-    sprintf(DispString, "%10.5g", RegisterA);
++    sprintf(DispString, "%10.10g", RegisterA);
+     break;
+   case '*':
+     RegisterA = RegisterB * RegisterA;
+-    sprintf(DispString, "%10.5g", RegisterA);
++    sprintf(DispString, "%10.10g", RegisterA);
+     break;
+   case '/':
+     RegisterA = RegisterB / RegisterA;
+-    sprintf(DispString, "%10.5g", RegisterA);
++    sprintf(DispString, "%10.10g", RegisterA);
+     break;
+   default:
+     break;
diff --git a/debian/wmcalc.1 b/debian/wmcalc.1
index e7fc56a..da0b581 100644
--- a/debian/wmcalc.1
+++ b/debian/wmcalc.1
@@ -19,7 +19,7 @@
 wmcalc \- dockable calculator application
 .SH SYNOPSIS
 .B wmcalc
-[-g \fIgeometry\fP] [-d \fIdisplay\fP] [-v] [-f \fIconfigfile\fP] [-h]
+[\-g \fIgeometry\fP] [\-d \fIdisplay\fP] [\-v] [\-f \fIconfigfile\fP] [\-h]
 
 .SH DESCRIPTION
 This manual page documents briefly the
@@ -33,6 +33,7 @@ because the original program does not have a manual page.
 .\" respectively.
 \fBwmcalc\fP is a program designed to act as a simple calculator offering basic operations like addition, subtraction, multiplication, division, square and squareroot.  It is different from other calculator programs, however in that it is designed to take up very little desktop space.  As such, it can be left running on the desktop at all times.  It is intended to placed in the WindowMaker dock, or in Wharf under Afterstep, though it should run as well under any window manager. 
 
+\fB*IMPORTANT*\fP: this calculator, due to its simple target, does not respect the proper mathematical operations order, and they are executed in the order they are inserted.
 
 Buttons are defined as:
 .nf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcalc.git

