Hi, On Sat, Jan 19, 2013 at 11:32:37AM +0000, PICCA Frédéric-Emmanuel wrote: > >The diff you sent doesn't contain these patches... > > Sorry about that, I did the debdiff with the .dsc but. > > So here the 2 patches
Perhaps I'm wrong, but from what I can see only the first and last hunks
patching setup.py are actually relevant, the rest just renames the
argument? Did I miss something significant?
> --- a/setup.py
> +++ b/setup.py
> @@ -585,7 +585,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)
>
> @@ -783,9 +782,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)
--
Jonathan Wiltshire j...@debian.org
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
<directhex> i have six years of solaris sysadmin experience, from
8->10. i am well qualified to say it is made from bonghits
layered on top of bonghits
signature.asc
Description: Digital signature
