[ppl] 62/68: Imported Debian patch 1:1.1-4

[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 376a60d74714b7db723c9a49c3d0e591e3538d0f
Author: Matthias Klose <doko at debian.org>
Date:   Wed Apr 29 16:10:11 2015 +0200

    Imported Debian patch 1:1.1-4
---
 debian/changelog                   |  6 ++++++
 debian/control                     |  2 +-
 debian/patches/doxygen-update.diff | 15 +++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  4 +++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ad4c53..844f088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ppl (1:1.1-4) unstable; urgency=medium
+
+  * Fix build with doxygen 1.8.9.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 29 Apr 2015 16:10:11 +0200
+
 ppl (1:1.1-3) unstable; urgency=medium
 
   * Build using dh-autoreconf instead of autotools-dev. Closes: #755959.
diff --git a/debian/control b/debian/control
index e29fc87..8335b5c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Michael Tautschnig <mt at debian.org>, Matthias Klose <doko at debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 6.0.7~), dh-autoreconf,
  libgmp-dev, swi-prolog [!hurd-i386], chrpath,
  libncurses5-dev, libncursesw5-dev
diff --git a/debian/patches/doxygen-update.diff b/debian/patches/doxygen-update.diff
new file mode 100644
index 0000000..6b2c561
--- /dev/null
+++ b/debian/patches/doxygen-update.diff
@@ -0,0 +1,15 @@
+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/series b/debian/patches/series
index ccdb225..85383c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # empty
 latex-header.diff
 link-tests-with-libmpq.diff
+doxygen-update.diff
diff --git a/debian/rules b/debian/rules
index 0964668..0032a84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +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)
 
-CFLAGS = $(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(dpkg-buildflags --get CFLAGS) -Wall -g
 CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
@@ -78,6 +79,7 @@ configure-stamp:
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
+		CPPFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
 		LDFLAGS="$(LDFLAGS)"

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