[flint] 01/01: switch to gmp

[felix salfelder]

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

felix-guest pushed a commit to branch master-gmp
in repository flint.

commit 619ef111f05592cb419148494ecbffc13a963a47
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat Aug 31 11:34:46 2013 +0200

    switch to gmp
    
    - mpir to gmp wrapper
    - add -Iwrapperdir
    - use sed to adapt installed headers
    - builddep on sed and libgmp-dev, not libmpir-dev
    - changelog
---
 debian/changelog      |    1 +
 debian/control        |    4 ++--
 debian/include/mpir.h |   10 ++++++++++
 debian/rules          |    8 ++++++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73da544..3cd31e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 flint (2.3-1) UNRELEASED; urgency=low
 
   * new upstream release
+  * use gmp, not mpir
 
  -- Felix Salfelder <felix at salfelder.org>  Sun, 26 May 2013 21:36:55 +0200
 
diff --git a/debian/control b/debian/control
index f983d70..64fb388 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Felix Salfelder <felix at salfelder.org>
 Homepage: http://www.flintlib.org/
-Build-Depends: debhelper (>= 5),
- libmpir-dev, libqd-dev, libntl-dev, libzn-poly-dev (>=0.9)
+Build-Depends: debhelper (>= 5), sed (>=4.2.1),
+ libgmp-dev, libqd-dev, libntl-dev, libzn-poly-dev (>=0.9)
 Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/flint.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/flint.git
diff --git a/debian/include/mpir.h b/debian/include/mpir.h
new file mode 100644
index 0000000..761ce61
--- /dev/null
+++ b/debian/include/mpir.h
@@ -0,0 +1,10 @@
+/* wrap mpir includes to gmp
+ * and define some old stuff, flint still relies on
+ */
+
+#include <gmp.h>
+
+#ifndef __GMP_BITS_PER_MP_LIMB
+# define __GMP_BITS_PER_MP_LIMB GMP_LIMB_BITS
+#endif
+
diff --git a/debian/rules b/debian/rules
index 41317df..30556b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,13 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	:
 
-override_dh_auto_build:
-	dh_auto_build
+override_dh_auto_build: override_dh_auto_configure
+	$(MAKE) FLINT_MPIR_INCLUDE_DIR=$(CURDIR)/debian/include
 
 override_dh_auto_install:
 	dh_auto_install
 	ln -sf libflint-$(VERSION).so debian/tmp/usr/lib/libflint.so
+	sed -i '/^#includ/s#mpir\.h#gmp.h#' -i debian/tmp/usr/include/flint/*.h
+
+build: override_dh_auto_build
+.PHONY: build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flint.git