[SCM] Packaging for pytango branch, master, updated. debian/7.2.3-2

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

The following commit has been merged in the master branch:
commit f42bdfb2244e867a06a35943d9bf9e0d5dd882f7
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue May 1 19:05:45 2012 +0200

    fix the FTBFS due to the package split

diff --git a/debian/changelog b/debian/changelog
index a465245..bfcfa5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pytango (7.2.3-2) unstable; urgency=low
+
+  * debian/rules
+    - use dh_sphinxdoc only for the doc package (Closes: #670955)
+  * debian/control
+    - add Build-Depends-Indep
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 01 May 2012 18:08:18 +0200
+
 pytango (7.2.3-1) unstable; urgency=low
 
   * Imported Upstream version 7.2.3
diff --git a/debian/control b/debian/control
index 68ebb04..d5e7bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
 Build-Depends: debhelper (>= 8),
-               graphviz,
                libboost-python-dev,
                liblog4tango4-dev,
                libtango7-dev,
                python-all-dev (>= 2.6.6-3~),
-               python-numpy (>= 1:1.4.1-4~),
-               python-sphinx
+               python-numpy (>= 1:1.4.1-4~)
+Build-Depends-Indep: graphviz,
+		     python-sphinx
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pytango.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/pytango.git
diff --git a/debian/rules b/debian/rules
index 2aa3528..e09e068 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-# for backport on stable without bpo
-WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
-
 override_dh_clean:
 	rm -rf build/sphinx
 	dh_clean
@@ -11,6 +8,12 @@ override_dh_auto_install:
 	dh_auto_install -- --install-html=$(CURDIR)/debian/python-pytango-doc/usr/share/doc/python-pytango-doc/html
 	dh_numpy
 
+override_dh_installdocs:
+	dh_installdocs
+ifneq (,$(filter python-pytango-doc, $(shell dh_listpackages)))
+	# add the - for backport where dh_sphinxdoc is not available
+	-dh_sphinxdoc -ppython-pytango-doc
+endif
 
 %:
-	dh $@ --with python2 $(WITH_SPHINXDOC)
+	dh $@ --with python2

-- 
Packaging for pytango