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

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 422b35b7dc9061c50dd2daa60ccad04efff0b10c
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Apr 24 09:39:33 2011 +0200

    fix the doc installation using the doc file

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
new file mode 100644
index 0000000..d720749
--- /dev/null
+++ b/debian/patches/0001-install-documentation-with-the-debian-docs-file.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..3fdf5fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-install-documentation-with-the-debian-docs-file.patch

-- 
framework for TANGO control system client applications