[hdf5] 06/22: debian/control: Build-Depends-Indep: doxygen, php5-cli

[Gilles Filippini]

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

pini pushed a commit to branch master-1.10
in repository hdf5.

commit fc94b344efbe09fa48316567731a433cbb2b4a07
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Apr 18 17:21:32 2016 +0200

    debian/control: Build-Depends-Indep: doxygen, php5-cli
---
 debian/control |  3 ++-
 debian/rules   | 15 +--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index ef0f66a..cdd4c24 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), mpi-default-dev, libmpich-dev, zlib1g-dev,
  libjpeg-dev, debhelper (>= 9~), gfortran,
  sharutils, chrpath, autotools-dev, automake, dh-autoreconf,
- doxygen [!m68k !sh4], php5-cli [!m68k !sh4],
  libaec-dev,
+Build-Depends-Indep:
+ doxygen, php5-cli,
 Standards-Version: 3.9.7
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/hdf5.git
diff --git a/debian/rules b/debian/rules
index 0ad4960..3e5c2a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,15 +82,6 @@ endef
 $(foreach mpi,openmpi mpich,$(eval $(call CHECK_FLAVOR,$(mpi))))
 # END - Construct the FLAVORS list
 
-# Don't build doc on archs where php5-cli is not available:
-NODOCARCHS ?= !m68k !sh4
-ifeq (,$(filter !$(DEB_HOST_ARCH),$(NODOCARCHS)))
-install_doc = yes
-else
-install_doc = no
-export DH_OPTIONS += -Nlibhdf5-doc
-endif
-
 # BEGIN - Configure flags and environment variables
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        USE_PROD = production
@@ -255,7 +246,6 @@ override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(libversion)
 
 
-ifeq (yes,$(install_doc))
 build_doc:
 	echo "builddeps:Built-Using=doxygen (= $$(dpkg-query -W -f='$${source:Version}' doxygen))" >>debian/libhdf5-doc.substvars
 	# Upgrade the doxygen configuration file
@@ -276,10 +266,7 @@ install_doc:
 
 override_dh_auto_build-indep: build_doc
 override_dh_auto_install-indep: install_doc
-else
-override_dh_auto_build-indep:
-override_dh_auto_install-indep:
-endif
+
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k release_docs/RELEASE.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git