[SCM] framework for TANGO control system client applications branch, master, updated. upstream/2.1.1-21-g913e9b1

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

The following commit has been merged in the master branch:
commit 913e9b1b3e8e2605f5a0f2b49bbeac38c7968bce
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Aug 8 21:24:51 2011 +0200

    use dh_sphinxdoc

diff --git a/debian/changelog b/debian/changelog
index 890c3eb..c000646 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,4 +3,4 @@ taurus (2.1.1-1) unstable; urgency=low
   * Initial release (Closes: #614247)
   * Thanks to Justin B Rye for package description review
 
- -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Sun, 13 Feb 2011 11:28:20 +0100
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 13 Feb 2011 11:28:20 +0100
diff --git a/debian/control b/debian/control
index a99873a..cdd05b3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: taurus
 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>
+Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Build-Depends: debhelper (>= 8.1.1),
 	       python-all (>= 2.6.6-3~),
 	       pyqt4-dev-tools,
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8.1.1),
 	       python-qt4,
 	       python-qwt5-qt4,
 	       libqt4-dev
-Build-Depends-Indep: python-sphinx,
+Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg),
 		     python-ply,
 		     python-lxml,
 		     python-spyderlib,
@@ -26,6 +26,7 @@ Section: python
 Architecture: all
 Depends: ${misc:Depends},
 	 ${python:Depends},
+	 ${sphinxdoc:Depends},
 	 python-qwt5-qt4,
 	 python-pytango (>= 7.1.3),
 	 python-guiqwt,
@@ -33,8 +34,7 @@ Depends: ${misc:Depends},
 	 python-lxml,
 	 spyder,
 	 pymca,
-	 python-h5py,
-	 libjs-jquery
+	 python-h5py
 Provides: ${python:Provides}
 Description: framework for Tango Control System CLI and GUI applications.
  TAURUS is a library for connecting client side applications (command-line
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 4c326f6..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-taurus/html/_static/jquery.js
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 765aeea..6ea0627 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,6 @@ get-orig-source:
 	uscan --force-download --upstream-version $(VERSION)
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --with sphinxdoc
 
 .PHONY: get-orig-source
\ No newline at end of file

-- 
framework for TANGO control system client applications