[freefoam] 01/02: Revert joining all BDs. Separate arch-indep again.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freefoam.

commit cc007a9a41a25f793a79617884517a1d1474b8a8
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Sep 27 22:58:06 2014 +0200

    Revert joining all BDs. Separate arch-indep again.
---
 debian/control | 21 +++++++++++----------
 debian/rules   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 4ce1f44..0ff25d7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,28 +10,29 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/freefoam.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/freefoam.git
 Homepage: http://freefoam.wiki.sourceforge.net/
 Build-Depends:
- asciidoc,
- asymptote,
  cmake,
- dblatex,
  debhelper (>= 9),
- docbook-utils,
- doxygen,
  dpkg-dev (>= 1.16.1~),
- dvipng,
  flex,
  gawk,
- graphviz,
- libjs-jquery,
  libreadline6-dev,
  libscotch-dev,
- libxml2-utils,
  mpi-default-bin,
  mpi-default-dev,
  paraview (>= 3.8),
  python,
- texlive-science,
  zlib1g-dev
+Build-Depends-Indep:
+ asciidoc,
+ asymptote,
+ dblatex,
+ docbook-utils,
+ doxygen,
+ dvipng,
+ graphviz,
+ libjs-jquery,
+ libxml2-utils,
+ texlive-science
 Standards-Version: 3.9.6
 
 Package: freefoam
diff --git a/debian/rules b/debian/rules
index a1b0a47..da6f170 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,6 @@ FF_DOC=							\
 	-DFOAM_ENABLE_XHTML_GUIDES=OFF			\
 	-DFOAM_ENABLE_XHTML_HELP=OFF			\
 	-DFOAM_ENABLE_MATHJAX=OFF			\
-	-DFOAM_ENABLE_DOXYGEN_DOCS=ON		\
 	-DFOAM_ENABLE_MANPAGE_HELP=OFF			\
 	-DFOAM_DOCS_FOR_SF=OFF				\
 
@@ -66,7 +65,8 @@ extra_flags= 					\
 	$(FF_INSTALL)
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(extra_flags)
+	if [ -x /usr/bin/doxygen ] ; then dh_auto_configure -- $(extra_flags) -DFOAM_ENABLE_DOXYGEN_DOCS=ON	;\
+		else dh_auto_configure -- $(extra_flags) -DFOAM_ENABLE_DOXYGEN_DOCS=OFF; fi
 
 override_dh_installchangelogs:
 	dh_installchangelogs -Xchanges

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