[Python-modules-commits] r1306 - in /packages/kiwi/trunk/debian: changelog control patches/03_epyrun_use_local_modules.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Aug 26 20:22:45 2006
New Revision: 1306

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1306
Log:
provide a DISPLAY for epyrun to run in

Modified:
    packages/kiwi/trunk/debian/changelog
    packages/kiwi/trunk/debian/control
    packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff

Modified: packages/kiwi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/changelog?rev=1306&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Sat Aug 26 20:22:45 2006
@@ -12,8 +12,12 @@
   - enable building the API docs and instlaling the examples; the howto is
     not fully buildable from the tarball's contents plus tools
     (Closes: #384159)
+  * debian/control, debian/rules:
+  - make the API building process run inside a virtual X server, for it
+    needs to import GTK+, which really wants a DISPLAY;
+  - we need to build-depend on xvfb and xbase-clients for that to work
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 26 Aug 2006 16:33:24 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 26 Aug 2006 16:56:28 -0300
 
 kiwi (1.9.8-7) unstable; urgency=high
 

Modified: packages/kiwi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/control?rev=1306&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/control (original)
+++ packages/kiwi/trunk/debian/control Sat Aug 26 20:22:45 2006
@@ -4,7 +4,7 @@
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-setuptools (>= 0.6b3-1)
-Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.3), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0-1)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.3), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0-1), xvfb, xbase-clients
 XS-Python-Version: >= 2.4
 Standards-Version: 3.7.2
 

Modified: packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff?rev=1306&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff (original)
+++ packages/kiwi/trunk/debian/patches/03_epyrun_use_local_modules.diff Sat Aug 26 20:22:45 2006
@@ -1,5 +1,23 @@
---- tools/epyrun~	2006-08-24 21:43:05.000000000 -0300
-+++ tools/epyrun	2006-08-26 16:32:08.000000000 -0300
+diff -urN kiwi-1.9.9.old/doc/Makefile kiwi-1.9.9/doc/Makefile
+--- kiwi-1.9.9.old/doc/Makefile	2006-08-24 21:43:21.000000000 -0300
++++ kiwi-1.9.9/doc/Makefile	2006-08-26 17:16:07.000000000 -0300
+@@ -41,11 +41,11 @@
+ 	cp ../examples/Person/Person.glade howto/
+ 
+ api:
+-	cd .. && tools/epyrun
++	cd .. && xvfb-run -a tools/epyrun
+ 	mv ../html api
+ 
+ apicheck: 
+-	cd .. && tools/epyrun --check
++	cd .. && xvfb-run -a "tools/epyrun --check"
+ 
+ clean:
+ 	rm -rf api/ howto/ *.log *.aux *.l2h *.dvi *.ps *.bak *~
+diff -urN kiwi-1.9.9.old/tools/epyrun kiwi-1.9.9/tools/epyrun
+--- kiwi-1.9.9.old/tools/epyrun	2006-08-24 21:43:05.000000000 -0300
++++ kiwi-1.9.9/tools/epyrun	2006-08-26 17:15:36.000000000 -0300
 @@ -9,6 +9,10 @@
  import shutil
  import sys