rev 19573 - in kde-extras/kmymoney2/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2013-05-24 23:30:50 +0000 (Fri, 24 May 2013)
New Revision: 19573

Added:
   kde-extras/kmymoney2/trunk/debian/patches/
   kde-extras/kmymoney2/trunk/debian/patches/gmp5.patch
   kde-extras/kmymoney2/trunk/debian/patches/series
Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/control
Log:
* Upload to unstable 
* Ack NMU - Thanks Sebastian
  - Fixes "FTBFS: mymoneymoney.cpp:167:54:" (Closes: #707374) 
* Update debian/control - vcs-field-not-canonical
* Update Standards-Version: 3.9.4 - no further changes
* Non-maintainer upload.
* debian/patches/gmp5.patch: Apply upstream patch to fix builds with newer
  GMP. (Closes: #707374)

Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2013-05-24 20:45:47 UTC (rev 19572)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2013-05-24 23:30:50 UTC (rev 19573)
@@ -1,9 +1,22 @@
-kmymoney (4.6.3-2) UNRELEASED; urgency=low
+kmymoney (4.6.3-2) unstable; urgency=low
 
+  * Upload to unstable 
   * Update Recommends: gnupg-agent (Closes: #687184)
+  * Ack NMU - Thanks Sebastian
+    - Fixes "FTBFS: mymoneymoney.cpp:167:54:" (Closes: #707374) 
+  * Update debian/control - vcs-field-not-canonical
+  * Update Standards-Version: 3.9.4 - no further changes
 
- -- Mark Purcell <msp at debian.org>  Sat, 06 Oct 2012 22:09:02 +1000
+ -- Mark Purcell <msp at debian.org>  Sat, 25 May 2013 09:30:26 +1000
 
+kmymoney (4.6.2-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/gmp5.patch: Apply upstream patch to fix builds with newer
+    GMP. (Closes: #707374)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Mon, 20 May 2013 11:09:49 +0200
+
 kmymoney (4.6.3-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/kmymoney2/trunk/debian/control
===================================================================
--- kde-extras/kmymoney2/trunk/debian/control	2013-05-24 20:45:47 UTC (rev 19572)
+++ kde-extras/kmymoney2/trunk/debian/control	2013-05-24 23:30:50 UTC (rev 19573)
@@ -9,10 +9,10 @@
  libboost-graph-dev, libfinance-quote-perl, libgpgme11-dev, libalkimia-dev,
  libical-dev, libjpeg-dev, libofx-dev, libgmp-dev,
  libpng-dev, libsqlite3-dev, zlib1g-dev, pkg-config
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://kmymoney2.sourceforge.net
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kmymoney2/
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kmymoney2/trunk
+Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/kmymoney2/trunk
 
 Package: kmymoney
 Architecture: any

Added: kde-extras/kmymoney2/trunk/debian/patches/gmp5.patch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/gmp5.patch	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/gmp5.patch	2013-05-24 23:30:50 UTC (rev 19573)
@@ -0,0 +1,17 @@
+Description: Fix build with GMP 5
+Origin: upstream,
+ https://projects.kde.org/projects/extragear/office/kmymoney/repository/revisions/77209f84a85360e98d2e805d412956a8f2a77db3
+Bug-Debian: http://bugs.debian.org/707374
+Last-Update: 2013-05-20
+
+--- kmymoney-4.6.2.orig/kmymoney/mymoney/mymoneymoney.cpp
++++ kmymoney-4.6.2/kmymoney/mymoney/mymoneymoney.cpp
+@@ -164,7 +164,7 @@ QString MyMoneyMoney::formatMoney(const
+   // be much better than using KGlobal::locale()->formatMoney.
+   bool bNegative = false;
+   mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
+-  mpz_class right = (valueRef() - mpq_class(left)) * denom;
++  mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
+ 
+   if (right < 0) {
+     right = -right;

Added: kde-extras/kmymoney2/trunk/debian/patches/series
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/series	2013-05-24 23:30:50 UTC (rev 19573)
@@ -0,0 +1 @@
+gmp5.patch