[SCM] framework for TANGO control system client applications branch, master, updated. upstream/3.0.0_rc3-78-g5e2e8b5

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

The following commit has been merged in the master branch:
commit 75f0cfaa5c430a83c27d49d422ec5c787c91a778
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu May 3 22:25:29 2012 +0200

    add the no-doc option

diff --git a/debian/control b/debian/control
index 3389484..bbd2893 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Section: science
 Priority: extra
 Build-Depends: debhelper (>= 8),
                graphviz,
-	       inkscape,
+               inkscape,
                libqt4-dev,
                pyqt4-dev-tools,
                python-all (>= 2.6.6-3~),
diff --git a/debian/patches/forwarded-add-no-doc-option b/debian/patches/forwarded-add-no-doc-option
new file mode 100644
index 0000000..2b31285
--- /dev/null
+++ b/debian/patches/forwarded-add-no-doc-option
@@ -0,0 +1,69 @@
+Description: add the no-doc option to the install target
+ To build the doc only once during the build process. It is necessary
+ to allow not to run the install_html rule. this is the purpose of this
+ patch
+ .
+ taurus (3.0.0-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #614247)
+   * Thanks to Justin B Rye for package description review
+Author: Picca Frédéric-Emmanuel <picca at debian.org>
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- taurus-3.0.0.orig/setup.py
++++ taurus-3.0.0/setup.py
+@@ -473,12 +473,14 @@ class install(dftinstall):
+     
+     user_options = list(dftinstall.user_options)
+     user_options.extend([
+-        ('install-man=', None, 'installation directory for Unix man pages'),
+-        ('install-html=', None, "installation directory for HTML documentation")])
++            ('install-man=', None, 'installation directory for Unix man pages'),
++            ('install-html=', None, "installation directory for HTML documentation"),
++            ('no-doc', None, "do not install HTML documentation")])
+ 
+     def initialize_options(self):
+         self.install_man = None
+         self.install_html = None
++        self.no_doc = None
+         dftinstall.initialize_options(self)
+     
+     def finalize_options(self):
+@@ -503,6 +505,8 @@ class install(dftinstall):
+                 self.install_man = os.path.join(self.install_data, 'share', 'man')
+         if self.install_html is None:
+             self.install_html = os.path.join(self.install_data, 'share', 'doc', 'taurus', 'html')
++        if self.no_doc is None:
++            self.no_doc = False
+         self.dump_dirs("Installation directories")
+ 
+     def expand_dirs(self):
+@@ -513,6 +517,8 @@ class install(dftinstall):
+         return os.name == "posix"
+     
+     def has_html(self):
++        if self.no_doc:
++            return False
+         return sphinx is not None
+     
+     sub_commands = list(dftinstall.sub_commands)
+@@ -778,7 +784,7 @@ def svg_to_png(arg, dirname, fnames):
+             full_target_fname = os.path.join(path, target_fname)
+             if not os.path.isfile(full_target_fname):
+                 if use_inkscape:
+-                    cmd = "inkscape -z -e '%s' -w 24 '%s' &>/dev/null"%(full_target_fname, full_source_fname)
++                    cmd = "inkscape -z -e '%s' -w 24 '%s' > /dev/null"%(full_target_fname, full_source_fname)
+                     ok = not(os.system(cmd))
+                 else:
+                     pixmap = PyQt4.Qt.QPixmap(full_source_fname)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e73ad53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+forwarded-add-no-doc-option
diff --git a/debian/rules b/debian/rules
index aa3b3f0..a57d786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_build:
 	python setup.py build_doc --use-inkscape
 
 override_dh_auto_install:
-	dh_auto_install -- --install-html=$(CURDIR)/debian/python-taurus-doc/usr/share/doc/python-taurus-doc/html
+	dh_auto_install -- --skip-build --no-doc
 	dh_numpy
 
 %:

-- 
framework for TANGO control system client applications