[Python-modules-commits] r9937 - in packages/gamera/trunk/debian (5 files)

Sun Oct 4 10:39:16 UTC 2009

Date: Sunday, October 4, 2009 @ 10:39:15
  Author: jwilk-guest
Revision: 9937

Use a prebuilt image for the draw_text plugin documentation example if X server is not available (gendoc-draw-text.diff).
No longer build-depend on xvfb, xauth, xauth-base.

Added:
  packages/gamera/trunk/debian/patches/gendoc-draw-text.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/series
  packages/gamera/trunk/debian/rules

Modified: packages/gamera/trunk/debian/changelog
===================================================================

--- packages/gamera/trunk/debian/changelog	2009-10-03 20:52:15 UTC (rev 9936)
+++ packages/gamera/trunk/debian/changelog	2009-10-04 10:39:15 UTC (rev 9937)
@@ -1,8 +1,11 @@
 gamera (3.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Use a prebuilt image for the draw_text plugin documentation example if
+    X server is not available (gendoc-draw-text.diff). No longer build-depend
+    on xvfb, xauth, xauth-base.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Thu, 01 Oct 2009 22:23:46 +0200
+ -- Jakub Wilk <ubanus at users.sf.net>  Sun, 04 Oct 2009 12:34:05 +0200
 
 gamera (3.2.1-1) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2009-10-03 20:52:15 UTC (rev 9936)
+++ packages/gamera/trunk/debian/control	2009-10-04 10:39:15 UTC (rev 9937)
@@ -12,9 +12,7 @@
  libga-dev
 Build-Depends-Indep:
  python-docutils, python-pygments, python-numpy, python-imaging, python-wxgtk2.8,
- help2man,
- xvfb, xauth, xfonts-base
-XS-Python-Version: all
+ help2man
 Standards-Version: 3.8.3
 Homepage: http://gamera.sourceforge.net/
 

Added: packages/gamera/trunk/debian/patches/gendoc-draw-text.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	2009-10-04 10:39:15 UTC (rev 9937)
@@ -0,0 +1,67 @@
+Description: Use a prebuilt image for the draw_text plugin documentation example if X server is not available.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: gamera-3.2.2/doc/gendoc.py
+===================================================================
+--- gamera-3.2.2.orig/doc/gendoc.py	2009-10-04 11:58:57.000000000 +0200
++++ gamera-3.2.2/doc/gendoc.py	2009-10-04 11:59:10.000000000 +0200
+@@ -5,6 +5,8 @@
+ import wxversion
+ wxversion.select(["2.8", "2.6", "2.5", "2.4"])
+ 
++import draw_text_helper
++
+ if __name__ == "__main__":
+    core.init_gamera()
+    gendoc.gendoc(classes=[
+Index: gamera-3.2.2/doc/draw_text_helper.py
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gamera-3.2.2/doc/draw_text_helper.py	2009-10-04 12:00:01.000000000 +0200
+@@ -0,0 +1,46 @@
++#!/usr/bin/python
++
++# This script (including  the following line) was generated by running itself:
++DATA = 320, 300, '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'
++
++import sys
++import os
++import bz2
++import base64
++
++from gamera.core import init_gamera, Point, Dim, RGB, DENSE
++from gamera import plugin
++from gamera.plugins.draw import draw_text
++from gamera.plugins.string_io import _from_raw_string
++
++sys.stdout = file(os.devnull, 'w')
++init_gamera()
++sys.stdout = sys.__stdout__
++
++if __name__ == '__main__':
++	if not os.getenv('DISPLAY'):
++		print >>sys.stderr, 'This script needs access to an X server'
++		sys.exit(1)
++	import wxversion
++	wxversion.select(['2.8', '2.6', '2.5', '2.4'])
++	image = draw_text().__doc_example1__()
++	raw_string = image._to_raw_string()
++	bz2_string = bz2.compress(raw_string)
++	base64_string = base64.b64encode(bz2_string)
++	for line in open(__file__, 'rt'):
++		if line.startswith('DATA = '):
++			sys.stdout.write('DATA = %d, %d, %r\n' % (image.dim.ncols, image.dim.nrows, base64_string))
++		else:
++			sys.stdout.write(line)
++	sys.exit(0)
++
++if not os.getenv('DISPLAY'):
++	ncols, nrows, base64_string = DATA
++	bz2_string = base64.decodestring(base64_string)
++	raw_string = bz2.decompress(bz2_string)
++	image = _from_raw_string(Point(0, 0), Dim(ncols, nrows), RGB, DENSE, raw_string)
++	def static_draw_text_example(self, image=image):
++		return image
++	plugin.plugin_methods[RGB]['Draw']['draw_text'].doc_examples = [static_draw_text_example]
++
++# vim:ts=4 sw=4 noet

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2009-10-03 20:52:15 UTC (rev 9936)
+++ packages/gamera/trunk/debian/patches/series	2009-10-04 10:39:15 UTC (rev 9937)
@@ -1,4 +1,5 @@
 gendoc-use-wxversion.diff
+gendoc-draw-text.diff
 fix-paths.diff
 use-system-galib.diff
 use-system-vigra.diff

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2009-10-03 20:52:15 UTC (rev 9936)
+++ packages/gamera/trunk/debian/rules	2009-10-04 10:39:15 UTC (rev 9937)
@@ -2,7 +2,6 @@
 
 export DH_OPTIONS = --with=quilt
 
-ENSURE_XSERVER = $(shell [ -z "$$DISPLAY" ] && echo xvfb-run)
 PYTHONPATH = $(wildcard $(CURDIR)/build/lib.*-$(shell pyversions -dv))
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d ' ' -f 2)
 
@@ -31,7 +30,7 @@
 	cd doc/manpage/ && PYTHONPATH=$(PYTHONPATH) help2man --version-string=$(VERSION) --name='GUI for the Gamera framework' --no-info ./gamera_gui > gamera_gui.1
 
 doc/stamp: build/stamp doc/manpage/gamera_gui.1
-	cd doc && PYTHONPATH=$(PYTHONPATH) $(ENSURE_XSERVER) python gendoc.py
+	cd doc && PYTHONPATH=$(PYTHONPATH) python gendoc.py
 	touch $(@)
 
 .PHONY: clean


