r45585 - in /packages/gmp/trunk/debian: changelog fix-gmp-h.sh gmp.h rules

[smr at users.alioth.debian.org]

Author: smr
Date: Mon Feb 18 23:58:38 2013
New Revision: 45585

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45585
Log:
Update for upstram 5.1.1.  Add support for architectures aarch64 and x32.

Modified:
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/fix-gmp-h.sh
    packages/gmp/trunk/debian/gmp.h
    packages/gmp/trunk/debian/rules

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=45585&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog (original)
+++ packages/gmp/trunk/debian/changelog Mon Feb 18 23:58:38 2013
@@ -1,3 +1,12 @@
+gmp (2:5.1.1+dfsg-1) experimental; urgency=low
+
+  * New upstream.
+    - added support for x32.  Closes: #698000.
+  
+  * fix-gmp.sh: Add support for __aarch64__ (closes: #693467).
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 17 Feb 2013 21:16:31 -0600
+
 gmp (2:5.1.0+dfsg-1) experimental; urgency=low
 
   * New upstream.

Modified: packages/gmp/trunk/debian/fix-gmp-h.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/fix-gmp-h.sh?rev=45585&op=diff
==============================================================================
--- packages/gmp/trunk/debian/fix-gmp-h.sh (original)
+++ packages/gmp/trunk/debian/fix-gmp-h.sh Mon Feb 18 23:58:38 2013
@@ -9,7 +9,7 @@
 oldfn="$1/gmp.h"
 test -f "$oldfn" || exit 2
 
-fixname=`sed -e 's/#include//' debian/gmp.h | $CC -E - | sed -e '/^#/d' -e 's/ "//' -e 's/"//'`
+fixname=`sed -e 's/#.*include//' debian/gmp.h | $CC -E - | sed -e '/^#/d' -e 's/ "//' -e 's/"//'`
 mv $oldfn $1/$fixname
 cp debian/gmp.h $oldfn
 

Modified: packages/gmp/trunk/debian/gmp.h
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/gmp.h?rev=45585&op=diff
==============================================================================
--- packages/gmp/trunk/debian/gmp.h (original)
+++ packages/gmp/trunk/debian/gmp.h Mon Feb 18 23:58:38 2013
@@ -37,6 +37,8 @@
 
 #if defined(__alpha__)
 #include "gmp-alpha.h"
+#elif defined(__aarch64__)
+#include "gmp-aarch64.h"
 #elif defined(__arm__)
 #include "gmp-arm.h"
 #elif defined(__avr32__)
@@ -64,7 +66,11 @@
 #elif defined(__sparc__)
 #include "gmp-sparc.h"
 #elif defined(__x86_64__)
-#include "gmp-x86_64.h"
+#  if defined(__ILP32__)
+#    include "gmp-x86_x32.h"
+#  else
+#    include "gmp-x86_64.h"
+#  endif
 #else
 #error "The gmp-dev package is not usable with the architecture."
 #endif

Modified: packages/gmp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/rules?rev=45585&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Mon Feb 18 23:58:38 2013
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-ORIG_SRC_VERSION = 5.1.0
+ORIG_SRC_VERSION = 5.1.1
 
 include /usr/share/quilt/quilt.make