r38155 - in /packages/gmp/trunk/debian: README.Debian TODO changelog control gmp.h libgmp10-doc.README.Debian libgmp10-doc.examples libgmp3-doc.README.Debian libgmp3-doc.examples libgmp3.prerm rules

Sat Mar 5 03:20:51 UTC 2011

Author: smr
Date: Sat Mar  5 03:20:50 2011
New Revision: 38155

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38155
Log:
Merge v5 branch back into trunk.

Added:
    packages/gmp/trunk/debian/libgmp10-doc.README.Debian
      - copied unchanged from r38154, packages/gmp/branches/5.0.0-experimental/debian/libgmp10-doc.README.Debian
    packages/gmp/trunk/debian/libgmp10-doc.examples
      - copied unchanged from r38154, packages/gmp/branches/5.0.0-experimental/debian/libgmp10-doc.examples
Removed:
    packages/gmp/trunk/debian/libgmp3-doc.README.Debian
    packages/gmp/trunk/debian/libgmp3-doc.examples
    packages/gmp/trunk/debian/libgmp3.prerm
Modified:
    packages/gmp/trunk/debian/README.Debian
    packages/gmp/trunk/debian/TODO
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/control
    packages/gmp/trunk/debian/gmp.h
    packages/gmp/trunk/debian/rules

Modified: packages/gmp/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/README.Debian?rev=38155&op=diff
==============================================================================

--- packages/gmp/trunk/debian/README.Debian (original)
+++ packages/gmp/trunk/debian/README.Debian Sat Mar  5 03:20:50 2011
@@ -2,9 +2,9 @@
 		------------------------------
 
 Sadly, due to licensing the GMP documentation is no longer shipped in
-Debian.  The package libgmp3-doc now contains only demo code.
+Debian.  The package libgmp10-doc now contains only demo code.
 
-Please see http://www.swox.com/gmp/#DOC for the documentation.
+Please see http://gmplib.org/manual/ for the documentation.
 
 
- -- Steve M. Robbins <smr at debian.org>, Fri, 14 Apr 2006 13:07:10 -0400
+ -- Steve M. Robbins <smr at debian.org>, Sat, 06 Nov 2010 18:00:53 -0500

Modified: packages/gmp/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/TODO?rev=38155&op=diff
==============================================================================
--- packages/gmp/trunk/debian/TODO (original)
+++ packages/gmp/trunk/debian/TODO Sat Mar  5 03:20:50 2011
@@ -1,1 +1,1 @@
-
+* remove old mp libraries.

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=38155&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog (original)
+++ packages/gmp/trunk/debian/changelog Sat Mar  5 03:20:50 2011
@@ -1,3 +1,60 @@
+gmp (2:5.0.1+dfsg-5) UNRELEASED; urgency=low
+
+  * Merge the v5 branch back to trunk.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 04 Mar 2011 21:18:30 -0600
+
+gmp (2:5.0.1+dfsg-4) experimental; urgency=low
+
+  * rules: Build with -O2 on ia64, to work around ICE
+    (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43603).
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 14 Feb 2011 21:39:01 -0600
+
+gmp (2:5.0.1+dfsg-3) experimental; urgency=low
+
+  [ Sylvestre Ledru ]
+  * Package moved to Debian Science.
+  
+  * gmp.h: Add support for __m68k__ (thanks, Thorsten Glaser).  
+    Closes: #601287.
+  
+  * libgmp3-doc.examples:
+  * libgmp3-doc.README.Debian: Rename to libgmp10-doc.xxx.
+  
+  * libgmp3.prerm: Remove obsolete file.  Was used to remove /usr/doc/xxx
+    symlinks from back at the time of the /usr/doc --> /usr/share/doc
+    transition.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 06 Nov 2010 17:55:15 -0500
+
+gmp (2:5.0.1+dfsg-2) experimental; urgency=low
+
+  * control: 
+  * rules: New packages libmp3, lib32mp3, lib64mp3.  Split library mp
+    out from the libgmp package as they have evolved to use different
+    major numbers now.  Make libgmp10-dev conflict & replace libgmp3-dev
+    packages; ditto for 32-bit and 64-bit variants.  Closes: #570225.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 28 Feb 2010 03:31:42 -0600
+
+gmp (2:5.0.1+dfsg-1) experimental; urgency=low
+
+  * New upstream release.  Library gmp SOVERSION bumped from 3 to 10.
+  
+  * control: New packages (libgmp10, libgmp10-dev, etc) replace
+    corresponding packages due to SOVERSION change.  Drop some
+    now-obsolete conflicts on libgmp3 and libgmp2 pacakges.
+    Bump Standards-Version to 3.8.4.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 07 Feb 2010 11:04:56 -0600
+
+gmp (2:5.0.0+dfsg-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 09 Jan 2010 19:38:41 -0600
+
 gmp (2:4.3.2+dfsg-2) UNRELEASED; urgency=low
 
   * Package moved to Debian Science

Modified: packages/gmp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/control?rev=38155&op=diff
==============================================================================
--- packages/gmp/trunk/debian/control (original)
+++ packages/gmp/trunk/debian/control Sat Mar  5 03:20:50 2011
@@ -7,7 +7,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/gmp/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/gmp/trunk/
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: libgmp3c2
 Section: libs

Modified: packages/gmp/trunk/debian/gmp.h
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/gmp.h?rev=38155&op=diff
==============================================================================
--- packages/gmp/trunk/debian/gmp.h (original)
+++ packages/gmp/trunk/debian/gmp.h Sat Mar  5 03:20:50 2011
@@ -35,32 +35,34 @@
 #endif
 #define gmp_wrapper_h
 
-#if defined(__arm__)
+#if defined(__alpha__)
+#include "gmp-alpha.h"
+#elif defined(__arm__)
 #include "gmp-arm.h"
 #elif defined(__avr32__)
 #include "gmp-avr32.h"
+#elif defined(__hppa__)
+#include "gmp-hppa.h"
 #elif defined(__i386__)
 #include "gmp-i386.h"
 #elif defined(__ia64__)
 #include "gmp-ia64.h"
-#elif defined(__hppa__)
-#include "gmp-hppa.h"
+#elif defined(__m68k__)
+#include "gmp-m68k.h"
+#elif defined(__mips__)
+#include "gmp-mips.h"
 #elif defined(__powerpc64__)
 #include "gmp-ppc64.h"
-#elif defined(__mips__)
-#include "gmp-mips.h"
 #elif defined(__powerpc__)
 #include "gmp-ppc.h"
 #elif defined(__s390__)
 #include "gmp-s390.h"
+#elif defined(__sh__)
+#include "gmp-sh.h"
 #elif defined(__sparc__)
 #include "gmp-sparc.h"
 #elif defined(__x86_64__)
 #include "gmp-x86_64.h"
-#elif defined(__alpha__)
-#include "gmp-alpha.h"
-#elif defined(__sh__)
-#include "gmp-sh.h"
 #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=38155&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Sat Mar  5 03:20:50 2011
@@ -32,7 +32,11 @@
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS += -O0
 else
-  CFLAGS += -O3
+  ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
+    CFLAGS += -O2
+  else
+    CFLAGS += -O3
+  endif
 endif
 
 lib32dir = usr/lib32


