[Pkg-gstreamer-commits] [gstreamer-vaapi] 01/01: drop Build-Depends-Indep and build docs unconditionally on all archs

[Vincent Cheng]

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

vcheng pushed a commit to branch master
in repository gstreamer-vaapi.

commit 360786d8db3eab48e78263f252fe776e11e2b107
Author: Vincent Cheng <vcheng at debian.org>
Date:   Wed Aug 6 23:59:45 2014 -0700

    drop Build-Depends-Indep and build docs unconditionally on all archs
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 8 +-------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index feb4284..467b7d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gstreamer-vaapi (0.5.9-2) UNRELEASED; urgency=medium
 
   * Remove spurious build-deps: libva-drm1, libavcodec-dev. (Closes: #757283)
+  * Drop Build-Depends-Indep and build docs unconditionally on all archs.
 
  -- Vincent Cheng <vcheng at debian.org>  Wed, 06 Aug 2014 23:56:00 -0700
 
diff --git a/debian/control b/debian/control
index 74f2abe..16406ff 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
+ gtk-doc-tools (>= 1.9),
  libdrm-dev,
  libgl1-mesa-dev,
  libglib2.0-dev,
@@ -20,7 +21,6 @@ Build-Depends:
  libx11-dev,
  libxrandr-dev,
  mesa-common-dev
-Build-Depends-Indep: gtk-doc-tools (>= 1.9)
 Standards-Version: 3.9.5
 Homepage: http://gitorious.org/vaapi/gstreamer-vaapi
 Vcs-Git: git://anonscm.debian.org/pkg-gstreamer/gstreamer-vaapi.git
diff --git a/debian/rules b/debian/rules
index 4e3c839..0629fab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,6 @@
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
-indep_conf_flags = \
-	--with-html-dir=\$${prefix}/share/doc/$(gst_pkgname)
-
-ifeq ($(shell test "`dpkg -l gtk-doc-tools | grep ^ii`" && echo binary-indep),binary-indep)
-indep_conf_flags += --enable-gtk-doc
-endif
 
 # debian package version
 version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
@@ -37,7 +31,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-silent-rules --disable-builtin-libvpx \
-	                     $(indep_conf_flags)
+	--enable-gtk-doc --with-html-dir=\$${prefix}/share/doc/$(gst_pkgname)
 
 override_dh_install:
 	# purge .la files

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