[ppl] 03/06: Remove patches that were applied upstream, refresh others.
Tobias Hansen
thansen at moszumanska.debian.org
Sat Nov 12 16:21:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository ppl.
commit a75d745fea36469ef37fc9ea42c5a0b9c55018c3
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date: Sat Nov 12 16:04:32 2016 +0000
Remove patches that were applied upstream, refresh others.
---
debian/changelog | 5 +++++
debian/patches/0001-Warnings-avoided.patch | 25 ---------------------
.../0002-Adapted-to-SWI-Prolog-version-7.x.patch | 26 ----------------------
debian/patches/doxygen-update.diff | 15 -------------
debian/patches/latex-header.diff | 26 ----------------------
debian/patches/link-tests-with-libmpq.diff | 18 +--------------
debian/patches/series | 4 ----
7 files changed, 6 insertions(+), 113 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5d46e2b..d185b08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ ppl (1:1.2-1) UNRELEASED; urgency=medium
[ Tobias Hansen ]
* New upstream version. (Closes: #811825, #818957)
+ * Remove patches that were applied upstream:
+ - 0001-Warnings-avoided.patch
+ - 0002-Adapted-to-SWI-Prolog-version-7.x.patch
+ - doxygen-update.diff
+ - latex-header.diff
-- Andreas Tille <tille at debian.org> Sat, 12 Nov 2016 08:53:51 +0100
diff --git a/debian/patches/0001-Warnings-avoided.patch b/debian/patches/0001-Warnings-avoided.patch
deleted file mode 100644
index 5884b96..0000000
--- a/debian/patches/0001-Warnings-avoided.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 3764e71..0000000
--- a/debian/patches/0002-Adapted-to-SWI-Prolog-version-7.x.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/doxygen-update.diff b/debian/patches/doxygen-update.diff
deleted file mode 100644
index 6b2c561..0000000
--- a/debian/patches/doxygen-update.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/doc/user-language-interface.tex
-===================================================================
---- a/doc/user-language-interface.tex
-+++ b/doc/user-language-interface.tex
-@@ -74,6 +74,10 @@
-
- \newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
-
-+\newcommand{\clearemptydoublepage}{%
-+ \newpage{\pagestyle{empty}\cleardoublepage}%
-+}
-+
- \begin{document}
- \title{
- \includegraphics[height=9cm]{ppl_logo.pdf} \\
diff --git a/debian/patches/latex-header.diff b/debian/patches/latex-header.diff
deleted file mode 100644
index 3c7e2f8..0000000
--- a/debian/patches/latex-header.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: b/doc/devref-language-interface.tex
-===================================================================
---- a/doc/devref-language-interface.tex
-+++ b/doc/devref-language-interface.tex
-@@ -72,6 +72,8 @@
-
- \setlength{\headheight}{24pt}
-
-+\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
-+
- \begin{document}
- \title{
- \includegraphics[height=9cm]{ppl_logo.pdf} \\
-Index: b/doc/user-language-interface.tex
-===================================================================
---- a/doc/user-language-interface.tex
-+++ b/doc/user-language-interface.tex
-@@ -72,6 +72,8 @@
-
- \setlength{\headheight}{24pt}
-
-+\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
-+
- \begin{document}
- \title{
- \includegraphics[height=9cm]{ppl_logo.pdf} \\
diff --git a/debian/patches/link-tests-with-libmpq.diff b/debian/patches/link-tests-with-libmpq.diff
index 74e41c9..b571243 100644
--- a/debian/patches/link-tests-with-libmpq.diff
+++ b/debian/patches/link-tests-with-libmpq.diff
@@ -1,8 +1,6 @@
-Index: b/tests/Makefile.am
-===================================================================
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -45,6 +45,9 @@ files.hh \
+@@ -45,6 +45,9 @@
files.cc \
ppl_test.cc
@@ -12,17 +10,3 @@ Index: b/tests/Makefile.am
LDADD = \
$(top_builddir)/src/libppl.la \
libppl_tests.a \
-Index: b/tests/Watchdog/Makefile.am
-===================================================================
---- a/tests/Watchdog/Makefile.am
-+++ b/tests/Watchdog/Makefile.am
-@@ -46,7 +46,8 @@ AM_CPPFLAGS = \
-
- LDADD = \
- $(top_builddir)/tests/libppl_tests.a \
--$(top_builddir)/src/libppl.la
-+$(top_builddir)/src/libppl.la \
-+ at extra_libraries@
-
- EXTRA_DIST =
-
diff --git a/debian/patches/series b/debian/patches/series
index a8af362..238f5c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
# empty
-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