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

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

The following commit has been merged in the master branch:
commit 90a1f383637f78d9036c85808cd04f98cbd87237
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Dec 3 09:43:40 2011 +0100

    use the intall-html options to install the documentation

diff --git a/debian/patches/0001-install-documentation-with-the-debian-docs-file.patch b/debian/patches/0001-install-documentation-with-the-debian-docs-file.patch
deleted file mode 100644
index d720749..0000000
--- a/debian/patches/0001-install-documentation-with-the-debian-docs-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Sun, 24 Apr 2011 09:38:26 +0200
-Subject: install documentation with the debian docs file
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index beda030..6750308 100644
---- a/setup.py
-+++ b/setup.py
-@@ -597,7 +597,7 @@ class install(dftinstall):
-     
-     sub_commands = list(dftinstall.sub_commands)
-     sub_commands.append(('install_man', has_man))
--    sub_commands.append(('install_html', has_html))
-+    #sub_commands.append(('install_html', has_html))
- 
- 
- class build_doc_api(Command):
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3fdf5fc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-install-documentation-with-the-debian-docs-file.patch
diff --git a/debian/rules b/debian/rules
index 6ea0627..b086206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 get-orig-source:
 	uscan --force-download --upstream-version $(VERSION)
 
+override_dh_auto_install:
+        dh_auto_install -- --install-html=$(CURDIR)/debian/python-taurus/usr/share/doc/python-taurus/html
+
 %:
 	dh $@ --with python2 --with sphinxdoc
 

-- 
framework for TANGO control system client applications