[SCM] Packaging for sardana branch, master, updated. upstream/1.0.0_rc5-14-g417bfdd

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

The following commit has been merged in the master branch:
commit 417bfdd5d8451db115e1ddcb29b1e25e3341b087
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 19 19:49:51 2012 +0100

    prepare for backport on stable without bpo

diff --git a/debian/control b/debian/control
index 17926c1..541832e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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.0.0),
+Build-Depends: debhelper (>= 8),
 	       graphviz,
 	       python-all (>= 2.6.6-3~),
 	       python-lxml (>= 2.1),
 	       python-pytango (>= 7.2.2),
-	       python-sphinx (>= 1.0.7+dfsg),
+	       python-sphinx,
 	       python-taurus
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.2
@@ -18,7 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sardana
 
 Package: python-sardana
 Section: python
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ${python:Depends},
diff --git a/debian/rules b/debian/rules
index 5f8d384..15466dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,16 @@
 #!/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
 
 override_dh_auto_install:
 	dh_auto_install -- --install-html=$(CURDIR)/debian/python-sardana/usr/share/doc/python-sardana/html
+	# on squeeze python-sphinx is to old so create a fake documentation for now
+	if [ ! -d build/sphinx ]; then mkdir -p build/sphinx/html; fi
 
 %:
-	dh $@ --with python2 --with sphinxdoc
+	dh $@ --with python2 $(WITH_SPHINXDOC)

-- 
Packaging for sardana