[SCM] framework for TANGO control system client applications branch, master, updated. e222e8f6402d9b74e498f4af8a0a18b36de2475d

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 23aa2ae85b172c4f4aee15ea425bdd390a1108ae
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Thu Apr 21 21:01:31 2011 +0200

    switch to python2

diff --git a/debian/control b/debian/control
index 314b02c..375e7d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,8 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.1.1),
-	       python-support (>= 0.90),
-	       python-dev,
+	       python-all (>= 2.6.6-3~),
 	       pyqt4-dev-tools,
 	       python-pytango (>= 7.1.3),
 	       python-qt4,
@@ -17,12 +15,12 @@ Build-Depends-Indep: python-sphinx,
 		     python-lxml,
 		     graphviz
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.6
+X-Python-Version: >= 2.6
 Homepage: http://www.tango-controls.org
 
 Package: python-taurus
 Section: python
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends},
 	 ${python:Depends},
 	 python-qwt5-qt4,
diff --git a/debian/rules b/debian/rules
index 7ccd70a..765aeea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,16 +5,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 get-orig-source:
 	uscan --force-download --upstream-version $(VERSION)
 
-override_dh_clean:
-	rm -rf build/sphinx
-	dh_clean
-
-# do not compress the javascript files generated by sphinx
-# if compressed the documentation search engine is broken.
-override_dh_compress:
-	dh_compress -X.js
-
 %:
-	dh $@ --with python-support
+	dh $@ --with python2
 
 .PHONY: get-orig-source
\ No newline at end of file

-- 
framework for TANGO control system client applications