[SCM] framework for TANGO control system client applications branch, master, updated. upstream/3.0.0_rc3-45-g6faf73f

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 6faf73fe7f5b124e4d790ac5608b350db866f294
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 19 14:55:20 2012 +0100

    prepare for backport on stable without bpo

diff --git a/debian/control b/debian/control
index 7a53079..f39dbc7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
-Build-Depends: debhelper (>= 8.1.1),
+Build-Depends: debhelper (>= 8),
 	       graphviz,
 	       libqt4-dev,
 	       pyqt4-dev-tools,
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 8.1.1),
 	       python-pytango (>= 7.1.3),
 	       python-qt4,
 	       python-qwt5-qt4,
-	       python-sphinx (>= 1.0.7+dfsg),
+	       python-sphinx,
 	       python-spyderlib
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
diff --git a/debian/rules b/debian/rules
index 857e27b..b9554b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@ export DH_VERBOSE=1
 
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
+# for backport on stable without bpo
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+
 get-orig-source:
 	uscan --force-download --upstream-version $(VERSION)
 
@@ -12,6 +15,6 @@ override_dh_auto_install:
 	dh_numpy
 
 %:
-	dh $@ --with python2,sphinxdoc
+	dh $@ --with python2 $(WITH_SPHINXDOC)
 
 .PHONY: get-orig-source
\ No newline at end of file

-- 
framework for TANGO control system client applications