[ppl] 66/68: Imported Debian patch 1:1.1-7.1
Andreas Tille
tille at debian.org
Sat Nov 12 08:42:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ppl.
commit 796f528dcb4c319d9fc3a9083174efaf3015b2e1
Author: Matthias Klose <doko at debian.org>
Date: Mon Dec 7 22:04:41 2015 +0100
Imported Debian patch 1:1.1-7.1
---
debian/changelog | 8 +++++
debian/control | 35 ----------------------
debian/patches/0001-Warnings-avoided.patch | 25 ++++++++++++++++
.../0002-Adapted-to-SWI-Prolog-version-7.x.patch | 26 ++++++++++++++++
debian/patches/series | 2 ++
5 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd0f811..43c1801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ppl (1:1.1-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build failure with with swi-prolog 7.x (Roberto Bagnara).
+ Closes: #787486.
+
+ -- Matthias Klose <doko at debian.org> Mon, 07 Dec 2015 22:04:41 +0100
+
ppl (1:1.1-7) unstable; urgency=medium
* Rename C++ library package for the libstdc++ v5 transition. Thanks Simon
diff --git a/debian/control b/debian/control
index 152d60c..20362f0 100644
--- a/debian/control
+++ b/debian/control
@@ -90,38 +90,3 @@ Description: Parma Polyhedra Library (C interface)
exception-safe, rather efficient and thoroughly documented.
.
This package provides the C interface.
-
-Package: libppl-doc
-Architecture: all
-Section: doc
-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
- numerical abstractions. The applications of convex polyhedra include
- program analysis, optimized compilation, integer and combinatorial
- optimization and statistical data-editing. The Parma Polyhedra
- Library is user friendly (you write `x + 2*y + 5*z <= 7' when you
- mean it), fully dynamic (available virtual memory is the only
- limitation to the dimension of anything), written in standard C++,
- exception-safe, rather efficient and thoroughly documented.
- .
- This package provides the documentation.
-
-Package: libppl-swi
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libppl13v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, swi-prolog
-Description: Parma Polyhedra Library (SWI Prolog interface)
- The Parma Polyhedra Library (PPL) is a C++ library for the
- manipulation of (not necessarily closed) convex polyhedra and other
- numerical abstractions. The applications of convex polyhedra include
- program analysis, optimized compilation, integer and combinatorial
- optimization and statistical data-editing. The Parma Polyhedra
- Library is user friendly (you write `x + 2*y + 5*z <= 7' when you
- mean it), fully dynamic (available virtual memory is the only
- limitation to the dimension of anything), written in standard C++,
- exception-safe, rather efficient and thoroughly documented.
- .
- This package provides the SWI Prolog interface.
diff --git a/debian/patches/0001-Warnings-avoided.patch b/debian/patches/0001-Warnings-avoided.patch
new file mode 100644
index 0000000..5884b96
--- /dev/null
+++ b/debian/patches/0001-Warnings-avoided.patch
@@ -0,0 +1,25 @@
+From 142a58fa623e5b875efa4bd73f1071688a38f0ed Mon Sep 17 00:00:00 2001
+From: Roberto Bagnara <roberto.bagnara at bugseng.com>
+Date: Tue, 24 Nov 2015 10:05:15 +0100
+Subject: [PATCH 1/2] Warnings avoided.
+
+---
+ .../tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4
+index 7b553e3..b2f7c32 100644
+--- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4
++++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4
+@@ -947,7 +947,7 @@ ppl_ at CLASS@_frequency_6_test :-
+ F_N == F_Nexptd, F_D == F_Dexptd,
+ V_N == V_Nexptd, V_D == V_Dexptd)
+ ;
+- \+ ppl_ at CLASS@_frequency(PS, LE, F_N, F_D, V_N, V_D)
++ \+ ppl_ at CLASS@_frequency(PS, LE, _F_N, _F_D, _V_N, _V_D)
+ ),
+ ppl_ at CLASS@_OK(PS),
+ ppl_delete_ at CLASS@(PS)
+--
+2.1.4
+
diff --git a/debian/patches/0002-Adapted-to-SWI-Prolog-version-7.x.patch b/debian/patches/0002-Adapted-to-SWI-Prolog-version-7.x.patch
new file mode 100644
index 0000000..3764e71
--- /dev/null
+++ b/debian/patches/0002-Adapted-to-SWI-Prolog-version-7.x.patch
@@ -0,0 +1,26 @@
+From c9b20bc27d2a9931f131b6c3350eadf3c7f33405 Mon Sep 17 00:00:00 2001
+From: Roberto Bagnara <roberto.bagnara at bugseng.com>
+Date: Tue, 24 Nov 2015 10:05:32 +0100
+Subject: [PATCH 2/2] Adapted to SWI-Prolog version 7.x.
+
+---
+ interfaces/Prolog/SWI/pl_clpq.pl | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/interfaces/Prolog/SWI/pl_clpq.pl b/interfaces/Prolog/SWI/pl_clpq.pl
+index 3b87de4..ca1854f 100644
+--- a/interfaces/Prolog/SWI/pl_clpq.pl
++++ b/interfaces/Prolog/SWI/pl_clpq.pl
+@@ -21,7 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
+ For the most up-to-date information see the Parma Polyhedra Library
+ site: http://bugseng.com/products/ppl/ . */
+
+-eat_eol.
++eat_eol :-
++ get_code(user_input, _EOL).
+
+ main :-
+ % FIXME: clearing the prompt as it is done here is a temporary workaround.
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 1b34177..a8af362 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ latex-header.diff
link-tests-with-libmpq.diff
doxygen-update.diff
reproducible_builds_gzip_n
+0001-Warnings-avoided.patch
+0002-Adapted-to-SWI-Prolog-version-7.x.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git
More information about the debian-science-commits
mailing list