diff -Nru ppl-1.1/debian/changelog ppl-1.1/debian/changelog
--- ppl-1.1/debian/changelog	2014-12-10 15:47:17.000000000 +0000
+++ ppl-1.1/debian/changelog	2015-03-10 13:44:59.000000000 +0000
@@ -1,3 +1,10 @@
+ppl (1:1.1-3ubuntu5) vivid; urgency=medium
+
+  * Fix build with doxygen 1.8.9.
+  * Remove the workaround for GCC PR target/60609.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 10 Mar 2015 14:40:23 +0100
+
 ppl (1:1.1-3ubuntu4) vivid; urgency=medium
 
   * Build using GCC 4.7 (to be able to build gcc-4.7 with support
diff -Nru ppl-1.1/debian/control ppl-1.1/debian/control
--- ppl-1.1/debian/control	2014-12-10 15:34:36.000000000 +0000
+++ ppl-1.1/debian/control	2015-03-10 13:40:10.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Michael Tautschnig <mt@debian.org>, Matthias Klose <doko@debian.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 6.0.7~), dh-autoreconf,
  g++-4.7 [!ppc64el],
  libgmp-dev, chrpath,
diff -Nru ppl-1.1/debian/patches/doxygen-update.diff ppl-1.1/debian/patches/doxygen-update.diff
--- ppl-1.1/debian/patches/doxygen-update.diff	1970-01-01 00:00:00.000000000 +0000
+++ ppl-1.1/debian/patches/doxygen-update.diff	2015-03-10 13:36:20.000000000 +0000
@@ -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 -Nru ppl-1.1/debian/patches/series ppl-1.1/debian/patches/series
--- ppl-1.1/debian/patches/series	2014-07-25 10:39:39.000000000 +0000
+++ ppl-1.1/debian/patches/series	2015-03-10 13:33:05.000000000 +0000
@@ -1,3 +1,4 @@
 # empty
 latex-header.diff
 link-tests-with-libmpq.diff
+doxygen-update.diff
diff -Nru ppl-1.1/debian/rules ppl-1.1/debian/rules
--- ppl-1.1/debian/rules	2014-12-10 15:36:34.000000000 +0000
+++ ppl-1.1/debian/rules	2015-03-10 13:49:11.000000000 +0000
@@ -27,15 +27,11 @@
   CC = $(DEB_HOST_GNU_TYPE)-gcc-4.7
   CXX = $(DEB_HOST_GNU_TYPE)-g++-4.7
 endif
-CFLAGS = $(subst -strong,,$(shell dpkg-buildflags --get CPPFLAGS; dpkg-buildflags --get CFLAGS) -Wall -g)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(subst -strong,,$(shell dpkg-buildflags --get CFLAGS) -Wall -g)
 CXXFLAGS = $(subst -strong,,$(shell dpkg-buildflags --get CXXFLAGS) -Wall -g)
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
-ifeq ($(DEB_HOST_MULTIARCH),arm-linux-gnueabihf)
-  CFLAGS += -marm
-  CXXFLAGS += -marm
-endif
-
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 confflags += --disable-ppl_lpsol --disable-ppl_lcdd
@@ -89,6 +85,7 @@
 		--infodir=\$${prefix}/share/info \
 		CC=$(CC) \
 		CXX=$(CXX) \
+		CPPFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
 		LDFLAGS="$(LDFLAGS)"