[SCM] framework for TANGO control system client applications branch, master, updated. debian/3.0.0-1-5-gf76a215

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

The following commit has been merged in the master branch:
commit f76a215a5907e0d734e1b644691b554a05a40158
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue Jan 22 23:55:34 2013 +0100

    rework the 0002 patch to be less invasive

diff --git a/debian/patches/0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch b/debian/patches/0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
index 2c15118..a4cc9e5 100644
--- a/debian/patches/0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
+++ b/debian/patches/0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
@@ -1,13 +1,13 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Fri, 18 Jan 2013 21:20:39 +0100
+Date: Tue, 22 Jan 2013 23:52:11 +0100
 Subject: upstream fix for the FTBFS due to image conversion
 
 ---
- setup.py |   24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
+ setup.py |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index c3afb89..92d570a 100644
+index c3afb89..19b1a54 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -585,7 +585,6 @@ if sphinx:
@@ -18,56 +18,11 @@ index c3afb89..92d570a 100644
              orig_dir = os.path.abspath(os.curdir)
              os.chdir(self.resource_dir)
              
-@@ -699,13 +698,13 @@ if sphinx:
- 
-     class build_doc(BuildDoc):
-         user_options = BuildDoc.user_options + \
--                     [('use-inkscape', None, 
--                       "Use inkscape for building the icon catalog (useful if QApplication cannot be used when building, but requires inkscape)")]
--        boolean_options = BuildDoc.boolean_options + ['use-inkscape']
-+                     [('external-img-tools', None, 
-+                       "Use external tools for converting the icon catalog (useful if QApplication cannot be used while building, but requires inkscape and imagemagick)")]
-+        boolean_options = BuildDoc.boolean_options + ['external-img-tools']
-         
-         def initialize_options (self):
-             BuildDoc.initialize_options(self)
--            self.use_inkscape = False
-+            self.external_img_tools = False
-         
-         def has_doc_api(self):
-             return True
-@@ -757,20 +756,20 @@ if sphinx:
-             # copy the tango icons to the build directory of documentation
-             target = os.path.join(build_dir, 'devel')
-             
--            if not self.use_inkscape:
-+            if not self.external_img_tools:
-                 import PyQt4.Qt
-                 if PyQt4.Qt.qApp.instance() is None:
-                     self.app = PyQt4.Qt.QApplication([])
-             
-             print("\tBuilding PNGs for icon catalog")   
--            os.path.walk(resource, svg_to_png, (resource, target, self.use_inkscape))
-+            os.path.walk(resource, svg_to_png, (resource, target, self.external_img_tools))
-             return
-     
-     cmdclass['build_doc'] = build_doc
- 
- def svg_to_png(arg, dirname, fnames):
--    resource, target, use_inkscape = arg
--    if not use_inkscape:
-+    resource, target, external_img_tools = arg
-+    if not external_img_tools:
-         import PyQt4.Qt
-     relpath = os.path.relpath(dirname, start=resource)
-     path = os.path.join(target, relpath)
-@@ -783,9 +782,12 @@ def svg_to_png(arg, dirname, fnames):
-             target_fname = fbase + ".png"
+@@ -784,8 +783,11 @@ 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:
+                 if use_inkscape:
 -                    cmd = "inkscape -z -e '%s' -w 24 '%s' > /dev/null"%(full_target_fname, full_source_fname)
-+                if external_img_tools:
 +                    cmd = "inkscape -z '%s' -e '%s' -w 24 >/dev/null 2>/dev/null"%(full_source_fname, full_target_fname)
                      ok = not(os.system(cmd))
 +                    if not ok:
diff --git a/debian/rules b/debian/rules
index cbd1d71..7366555 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ get-orig-source:
 
 override_dh_auto_build:
 	dh_auto_build -- --no-doc
-	python setup.py build_doc --external-img-tools
+	python setup.py build_doc --use-inkscape
 
 override_dh_auto_install:
 	dh_auto_install -- --skip-build --no-doc

-- 
framework for TANGO control system client applications