r46639 - in /packages/gmp/trunk/debian: changelog control patches/4a6d258b467f.patch patches/series

[xnox at users.alioth.debian.org]

Author: xnox
Date: Thu May  1 01:16:24 2014
New Revision: 46639

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46639
Log:
* Thanks Jordi for awesome NMUs! =)
* Apply changes from colin/ubuntu:
  - Recommend libstdc++-4.8-dev as a real alternative for the virtual
  libstdc++-dev.
* Cherry-pick patch from upstream to fix up ppc64el missing
  BMOD_1_TO_MOD_1_THRESHOLD define.

Added:
    packages/gmp/trunk/debian/patches/4a6d258b467f.patch
Modified:
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/control
    packages/gmp/trunk/debian/patches/series

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=46639&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog	(original)
+++ packages/gmp/trunk/debian/changelog	Thu May  1 01:16:24 2014
@@ -1,3 +1,14 @@
+gmp (2:6.0.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Thanks Jordi for awesome NMUs! =)
+  * Apply changes from colin/ubuntu:
+    - Recommend libstdc++-4.8-dev as a real alternative for the virtual
+    libstdc++-dev.
+  * Cherry-pick patch from upstream to fix up ppc64el missing
+    BMOD_1_TO_MOD_1_THRESHOLD define.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Thu, 01 May 2014 01:15:35 +0100
+
 gmp (2:6.0.0+dfsg-2.3) unstable; urgency=medium
 
   * Non-maintainer upload. Third time's a charm... I hope.

Modified: packages/gmp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/control?rev=46639&op=diff
==============================================================================
--- packages/gmp/trunk/debian/control	(original)
+++ packages/gmp/trunk/debian/control	Thu May  1 01:16:24 2014
@@ -49,7 +49,7 @@
  libcln-dev (<< 1.3.2-1.1), libmpc-dev (<< 0.9-3), libmpfr-dev (<< 3.0.1-5),
  librep-dev (<< 0.90.2-1.3), regina-normal-dev (<< 4.6-3)
 Replaces: libgmp3-dev, libgmp10-dev
-Recommends: libstdc++-dev
+Recommends: libstdc++-4.8-dev | libstdc++-dev
 Suggests: libgmp10-doc, libmpfr-dev
 Multi-Arch: same
 Description: Multiprecision arithmetic library developers tools

Added: packages/gmp/trunk/debian/patches/4a6d258b467f.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/4a6d258b467f.patch?rev=46639&op=file
==============================================================================
--- packages/gmp/trunk/debian/patches/4a6d258b467f.patch	(added)
+++ packages/gmp/trunk/debian/patches/4a6d258b467f.patch	Thu May  1 01:16:24 2014
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege at gmplib.org>
+# Date 1395835068 -3600
+# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7
+# Parent  301ce2788826a2d4d2725bd5cf01e998638db37a
+Provide default for BMOD_1_TO_MOD_1_THRESHOLD.
+
+diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm
+--- a/mpn/powerpc64/mode64/gcd_1.asm	Tue Mar 25 15:34:52 2014 +0100
++++ b/mpn/powerpc64/mode64/gcd_1.asm	Wed Mar 26 12:57:48 2014 +0100
+@@ -43,6 +43,9 @@
+ define(`n',     `r4')
+ define(`v0',    `r5')
+ 
++ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',,
++  `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)')
++
+ EXTERN_FUNC(mpn_mod_1)
+ EXTERN_FUNC(mpn_modexact_1c_odd)
+ 
+

Modified: packages/gmp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/patches/series?rev=46639&op=diff
==============================================================================
--- packages/gmp/trunk/debian/patches/series	(original)
+++ packages/gmp/trunk/debian/patches/series	Thu May  1 01:16:24 2014
@@ -1 +1,2 @@
 arm-asm-nothumb.patch
+4a6d258b467f.patch