[ppl] 55/68: Imported Debian patch 1:1.0-7

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ppl.

commit 80a6df9f691f2ebeeff83a3cd594f5e728f1d6b4
Author: Matthias Klose <doko at debian.org>
Date:   Thu May 9 12:46:30 2013 +0200

    Imported Debian patch 1:1.0-7
---
 debian/changelog            |  7 ++++++
 debian/control              |  2 +-
 debian/patches/gmp-5.1.diff | 60 +++++++++++++++++++++++++--------------------
 debian/rules                |  6 ++---
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88aef9c..b48909a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ppl (1:1.0-7) unstable; urgency=medium
+
+  * Fix typo in libppl-doc dependencies.
+  * Proper fix to build with both gmp 5.0 and 5.1.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 09 May 2013 12:46:30 +0200
+
 ppl (1:1.0-6) unstable; urgency=low
 
   * Fix build failure with gmp-5.1.
diff --git a/debian/control b/debian/control
index 7a048fd..79a92ca 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Description: Parma Polyhedra Library (C interface)
 Package: libppl-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, libjs-query
+Depends: ${misc:Depends}, libjs-jquery
 Description: Parma Polyhedra Library: Documentation
  The Parma Polyhedra Library (PPL) is a C++ library for the
  manipulation of (not necessarily closed) convex polyhedra and other
diff --git a/debian/patches/gmp-5.1.diff b/debian/patches/gmp-5.1.diff
index 4cd3d63..5766a5c 100644
--- a/debian/patches/gmp-5.1.diff
+++ b/debian/patches/gmp-5.1.diff
@@ -1,37 +1,45 @@
-Index: b/src/mp_std_bits.defs.hh
-===================================================================
---- a/src/mp_std_bits.defs.hh	2012-06-28 10:50:33.000000000 +0000
-+++ b/src/mp_std_bits.defs.hh	2013-05-06 15:52:58.121608172 +0000
-@@ -40,6 +40,7 @@
- 
- namespace std {
- 
-+#ifndef GMP_51
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
- //! Specialization of std::numeric_limits.
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
-@@ -161,6 +162,7 @@
-     return static_cast<Type>(0);
-   }
- };
-+#endif
- 
- } // namespace std
- 
 Index: b/src/mp_std_bits.cc
 ===================================================================
---- a/src/mp_std_bits.cc	2012-06-28 10:50:33.000000000 +0000
-+++ b/src/mp_std_bits.cc	2013-05-06 15:59:50.988399648 +0000
-@@ -25,6 +25,7 @@
+--- a/src/mp_std_bits.cc
++++ b/src/mp_std_bits.cc
+@@ -25,6 +25,9 @@
  #include "ppl-config.h"
  #include "mp_std_bits.defs.hh"
  
-+#ifndef GMP_51
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
  const bool std::numeric_limits<mpz_class>::is_specialized;
  const int std::numeric_limits<mpz_class>::digits;
  const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +71,4 @@
+@@ -70,3 +73,6 @@
  const bool std::numeric_limits<mpq_class>::traps;
  const bool std::numeric_limits<mpq_class>::tininess_before;
  const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+#endif
++
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+Index: b/src/mp_std_bits.defs.hh
+===================================================================
+--- a/src/mp_std_bits.defs.hh
++++ b/src/mp_std_bits.defs.hh
+@@ -38,6 +38,9 @@
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+ void swap(mpq_class& x, mpq_class& y);
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ namespace std {
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+@@ -164,6 +167,9 @@
+ 
+ } // namespace std
+ 
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ #include "mp_std_bits.inlines.hh"
+ 
+ #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/debian/rules b/debian/rules
index 30c455a..193a710 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,8 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH   ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-GMP_FLAG := $(shell if dpkg --compare-versions $$(dpkg -l libgmp-dev|awk '/^ii/ {print $$3}') ge 2:5.1.1; then printf %s -DGMP_51; fi)
-
-CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g $(GMP_FLAG)
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g $(GMP_FLAG)
+CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g
+CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY

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