[SCM] framework for TANGO control system client applications branch, master, updated. debian/3.0.0-1-1-g5b6e079
Frédéric-Emmanuel P?==?UTF-8?Q?ICCA
picca at synchrotron-soleil.fr
Wed Jan 16 17:19:06 UTC 2013
The following commit has been merged in the master branch:
commit 5b6e079f21f8dca554807fdf82e99ab9c7681d0c
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date: Wed Jan 16 17:10:12 2013 +0100
fix the FTBFS and regenerate the patch series with gbp-pq
diff --git a/debian/control b/debian/control
index 37a7825..bdf6240 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Section: science
Priority: extra
Build-Depends: debhelper (>= 8),
graphviz,
+ imagemagick,
inkscape,
libqt4-dev,
pymca,
diff --git a/debian/patches/forwarded-add-no-doc-option b/debian/patches/0001-forwarded-add-no-doc-option.patch
similarity index 66%
rename from debian/patches/forwarded-add-no-doc-option
rename to debian/patches/0001-forwarded-add-no-doc-option.patch
index 2b31285..933c240 100644
--- a/debian/patches/forwarded-add-no-doc-option
+++ b/debian/patches/0001-forwarded-add-no-doc-option.patch
@@ -1,28 +1,16 @@
-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:
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Wed, 16 Jan 2013 17:03:02 +0100
+Subject: forwarded-add-no-doc-option
-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>
+---
+ setup.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
---- taurus-3.0.0.orig/setup.py
-+++ taurus-3.0.0/setup.py
+diff --git a/setup.py b/setup.py
+index d64b7ee..c3afb89 100644
+--- a/setup.py
++++ b/setup.py
@@ -473,12 +473,14 @@ class install(dftinstall):
user_options = list(dftinstall.user_options)
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
new file mode 100644
index 0000000..5823579
--- /dev/null
+++ b/debian/patches/0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
@@ -0,0 +1,95 @@
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?=
+ <picca at synchrotron-soleil.fr>
+Date: Wed, 16 Jan 2013 17:05:59 +0100
+Subject: upstream fix for the FTBFS due to image conversion
+
+---
+ setup.py | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c3afb89..2ab7b83 100644
+--- a/setup.py
++++ b/setup.py
+@@ -69,6 +69,7 @@ packages = [
+ 'taurus.core.util.argparse',
+ 'taurus.core.util.decorator',
+ 'taurus.core.util.report',
++ 'taurus.core.utils', # old, deprecated: maintain for compatibility
+ 'taurus.core.resource',
+ 'taurus.core.simulation',
+ 'taurus.core.evaluation',
+@@ -113,6 +114,7 @@ packages = [
+ 'taurus.qt.qtgui.model',
+ 'taurus.qt.qtgui.panel',
+ 'taurus.qt.qtgui.panel.report',
++ 'taurus.qt.qtgui.panel.report.ui',
+ 'taurus.qt.qtgui.panel.ui',
+ 'taurus.qt.qtgui.plot',
+ 'taurus.qt.qtgui.plot.ui',
+@@ -585,7 +587,6 @@ if sphinx:
+ def run(self):
+ self.resource_dir = abspath('lib', 'taurus', 'qt', 'qtgui', 'resource')
+ self.taurus = os.path.join(self.resource_dir, 'taurus.png')
+- import PyQt4.Qt
+ orig_dir = os.path.abspath(os.curdir)
+ os.chdir(self.resource_dir)
+
+@@ -699,13 +700,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 +758,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 +784,12 @@ def svg_to_png(arg, dirname, fnames):
+ target_fname = fbase + ".png"
+ 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)
++ 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:
++ cmd = "convert -resize 24 '%s' '%s' >/dev/null 2>/dev/null"%(full_source_fname, full_target_fname)
++ ok = not(os.system(cmd))
+ else:
+ pixmap = PyQt4.Qt.QPixmap(full_source_fname)
+ pix = pixmap.scaledToWidth(24, PyQt4.Qt.Qt.SmoothTransformation)
diff --git a/debian/patches/series b/debian/patches/series
index e73ad53..419f92c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-forwarded-add-no-doc-option
+0001-forwarded-add-no-doc-option.patch
+0002-upstream-fix-for-the-FTBFS-due-to-image-conversion.patch
--
framework for TANGO control system client applications
More information about the debian-science-commits
mailing list