[ppl] 49/68: Imported Debian patch 1.0-2

[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 6d5110bac9fb128ff191c599170738d8749ca092
Author: Matthias Klose <doko at debian.org>
Date:   Thu Jan 31 13:45:12 2013 +0100

    Imported Debian patch 1.0-2
---
 debian/changelog                                      |  7 +++++++
 debian/patches/fix_ftbfs.diff                         | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 .../share/doc/libppl-doc/html/user-manual/jquery.js   |  1 +
 debian/rules                                          | 13 +++++++------
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61eb935..676e87e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ppl (1.0-2) unstable; urgency=low
+
+  * Fix build failure in testsuite on sparc, s390, s390x.
+  * Don't try to build the prolog bindings on arm64 and hurd-i386.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 31 Jan 2013 13:45:12 +0100
+
 ppl (1.0-1) experimental; urgency=low
 
   * New upstream version. Closes: #680897.
diff --git a/debian/patches/fix_ftbfs.diff b/debian/patches/fix_ftbfs.diff
new file mode 100644
index 0000000..95360ba
--- /dev/null
+++ b/debian/patches/fix_ftbfs.diff
@@ -0,0 +1,19 @@
+From 3822e9ecd0783a5743dd48cda86ae17ba702c468 Mon Sep 17 00:00:00 2001
+From: Abramo Bagnara <abramo.bagnara at bugseng.com>
+Date: Wed, 30 Jan 2013 09:20:06 +0100
+Subject: [PATCH] Added missing line.
+
+---
+ src/Float_defs.hh |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- a/src/Float.defs.hh
++++ b/src/Float.defs.hh
+@@ -261,6 +261,7 @@
+   static const int EXPONENT_MIN = -EXPONENT_MAX + 1;
+   static const int EXPONENT_MIN_DENORM = EXPONENT_MIN
+ 					- static_cast<int>(MANTISSA_BITS);
++  static const Floating_Point_Format floating_point_format = IEEE754_QUAD;
+   int inf_sign() const;
+   bool is_nan() const;
+   int zero_sign() const;
diff --git a/debian/patches/series b/debian/patches/series
index 9d53034..9cf2ea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 local_changes.diff
+fix_ftbfs.diff
diff --git a/debian/ppl-doc/usr/share/doc/libppl-doc/html/user-manual/jquery.js b/debian/ppl-doc/usr/share/doc/libppl-doc/html/user-manual/jquery.js
new file mode 120000
index 0000000..e082064
--- /dev/null
+++ b/debian/ppl-doc/usr/share/doc/libppl-doc/html/user-manual/jquery.js
@@ -0,0 +1 @@
+../../../../javascript/jquery/jquery.js
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index e1c8dd9..8a03670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,13 +28,14 @@ LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 confflags += --disable-ppl_lpsol --disable-ppl_lcdd
 
-## Disable the SWI-Prolog interface during architecture bootstrap
-ifeq ($(DEB_STAGE),stage1)
-confflags += --enable-interfaces=c,cxx
-DH_OPTIONS += -Nlibppl-swi
-export DH_OPTIONS
+# Disable the SWI-Prolog interface during architecture bootstrap, and
+# on some architectures
+ifneq (,$(filter stage1,$(DEB_STAGE))$(filter $(DEB_HOST_ARCH),arm64 hurd-i386))
+  confflags += --enable-interfaces=c,cxx
+  DH_OPTIONS += -Nlibppl-swi
+  export DH_OPTIONS
 else
-confflags += --enable-interfaces=c,cxx,swi_prolog
+  confflags += --enable-interfaces=c,cxx,swi_prolog
 endif
 
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

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