[deal.ii] 01/01: work around a doxygen bug

[Matthias Maier]

This is an automated email from the git hooks/post-receive script.

tamiko-guest pushed a commit to branch master
in repository deal.ii.

commit 2a2cbc913c7a45f6882f766d380c21ac8e404fca
Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
Date:   Tue Nov 15 21:24:06 2016 +0000

    work around a doxygen bug
---
 debian/changelog                               |  6 ++++
 debian/patches/series                          |  1 +
 debian/patches/work_around_a_doxygen_bug.patch | 39 ++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2198127..3ad5b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+deal.ii (8.4.2-1.1) UNRELEASED; urgency=medium
+
+  * Fix FTBFS due to a doxygen bug
+
+ -- Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>  Tue, 15 Nov 2016 21:23:28 +0000
+
 deal.ii (8.4.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index b889f74..9e263ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 allow_different_slepc_petsc_versions.patch
+work_around_a_doxygen_bug.patch
diff --git a/debian/patches/work_around_a_doxygen_bug.patch b/debian/patches/work_around_a_doxygen_bug.patch
new file mode 100644
index 0000000..b59aa4d
--- /dev/null
+++ b/debian/patches/work_around_a_doxygen_bug.patch
@@ -0,0 +1,39 @@
+From 943ef4288b9c8391aa03a7d18a169de35e37c21a Mon Sep 17 00:00:00 2001
+From: Wolfgang Bangerth <bangerth at colostate.edu>
+Date: Sat, 17 Sep 2016 21:16:19 -0600
+Subject: [PATCH] Work around a doxygen bug.
+
+---
+ doc/doxygen/CMakeLists.txt | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
+index de718fc..d82f84f 100644
+--- a/doc/doxygen/CMakeLists.txt
++++ b/doc/doxygen/CMakeLists.txt
+@@ -75,11 +75,20 @@ CONFIGURE_FILE(
+ 
+ 
+ #
+-# Generate header, footer and style files for doxygen
++# Generate header, footer and style files for doxygen.
++#
++# A bug in (at least) doxygen 1.8.12 required that these files already exist
++# if they are listed in the options.dox file, even though the -w command is
++# specifically intended to create them. See
++#    https://bugzilla.gnome.org/show_bug.cgi?id=771606
++# To work around this, do a 'touch' operation in them first to ensure they're
++# there before we call "doxygen -w".
+ #
+ ADD_CUSTOM_COMMAND(
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/header.html
+-    ${CMAKE_CURRENT_BINARY_DIR}/footer.html
++         ${CMAKE_CURRENT_BINARY_DIR}/footer.html
++  COMMAND ${CMAKE_COMMAND} -E touch header.html
++  COMMAND ${CMAKE_COMMAND} -E touch footer.html
+   COMMAND ${DOXYGEN_EXECUTABLE} -w html header.html footer.html style.css options.dox
+   COMMAND ${PERL_EXECUTABLE} -pi~ ${CMAKE_CURRENT_BINARY_DIR}/scripts/mod_header.pl header.html
+   COMMAND ${PERL_EXECUTABLE} -pi~ ${CMAKE_CURRENT_BINARY_DIR}/scripts/mod_footer.pl footer.html
+-- 
+2.7.3
+

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