[Python-modules-commits] r7937 - in packages/nevow/trunk/debian (5 files)

[bernat at users.alioth.debian.org]

    Date: Friday, March 20, 2009 @ 21:52:32
  Author: bernat
Revision: 7937

New upstream release and various fixes.

Added:
  packages/nevow/trunk/debian/lintian-overrides
  packages/nevow/trunk/debian/runtrial.py
Modified:
  packages/nevow/trunk/debian/changelog
  packages/nevow/trunk/debian/control
  packages/nevow/trunk/debian/rules

Modified: packages/nevow/trunk/debian/changelog
===================================================================
--- packages/nevow/trunk/debian/changelog	2009-03-20 20:49:28 UTC (rev 7936)
+++ packages/nevow/trunk/debian/changelog	2009-03-20 21:52:32 UTC (rev 7937)
@@ -1,3 +1,12 @@
+nevow (0.9.33-1) unstable; urgency=low
+
+  * New upstream release.
+  * Change the way we run tests to use an helper that will ensure that we
+    use nevow as it will be installed.
+  * Compile documentation with lore.
+
+ -- Vincent Bernat <bernat at debian.org>  Fri, 20 Mar 2009 21:52:53 +0100
+
 nevow (0.9.32-2) unstable; urgency=low
 
   * Don't try to byte-compile modules with python << 2.4. Closes: #519750.

Modified: packages/nevow/trunk/debian/control
===================================================================
--- packages/nevow/trunk/debian/control	2009-03-20 20:49:28 UTC (rev 7936)
+++ packages/nevow/trunk/debian/control	2009-03-20 21:52:32 UTC (rev 7937)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3)
-Build-Depends-Indep: python-twisted-core (>= 2.4), python-twisted-web (>= 0.6)
+Build-Depends-Indep: python-twisted-core (>= 2.4), python-twisted-web (>= 0.6), python-twisted-lore
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/nevow/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/nevow/trunk/
 Homepage: http://divmod.org/trac/wiki/DivmodNevow

Added: packages/nevow/trunk/debian/lintian-overrides
===================================================================
--- packages/nevow/trunk/debian/lintian-overrides	                        (rev 0)
+++ packages/nevow/trunk/debian/lintian-overrides	2009-03-20 21:52:32 UTC (rev 7937)
@@ -0,0 +1 @@
+python-nevow: package-contains-empty-directory usr/share/doc/python-nevow/examples/pastebin/data/

Modified: packages/nevow/trunk/debian/rules
===================================================================
--- packages/nevow/trunk/debian/rules	2009-03-20 20:49:28 UTC (rev 7936)
+++ packages/nevow/trunk/debian/rules	2009-03-20 21:52:32 UTC (rev 7937)
@@ -11,29 +11,29 @@
 DEB_DH_ALWAYS_EXCLUDE := .svn
 DEB_COMPRESS_EXCLUDE := .py .tac words
 
-binary-post-install/%::
-	# Don't know how to use nit... Don't ship it.
-	rm debian/$(cdbs_curpkg)/usr/bin/nit
-
-# Copy the documentation and missing JS files
 binary-post-install/python-nevow::
-	cp doc/txt/*.txt debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	# Copy documentation
+	mv debian/$(cdbs_curpkg)/usr/doc/howto debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	rm -rf debian/$(cdbs_curpkg)/usr/doc
+	# Clean up stuff
+	find debian/$(cdbs_curpkg) -type d -name .svn -print0 | xargs -0 rm -rf
+	find debian/$(cdbs_curpkg)/usr/share -type f -print0 | xargs -0 chmod -x
 
+TOPMODULES:=nevow formless
+install/python-nevow::
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-TRIAL=trial
-TOPMODULES:=nevow formless
-binary-post-install/python-nevow:: binary-post-install/%:
-	chmod +x \
-	  'debian/$(cdbs_curpkg)/usr/share/pyshared/nevow/test/segfault.py'
-
-	PYTHONPATH='debian/$(cdbs_curpkg)/usr/share/pyshared' \
-		'$(TRIAL)' --tbformat=emacs --reporter=bwverbose -- $(TOPMODULES)
-
-	# Importing the modules generates .pyc files, and dh_python (which
-	# normally cleans them) has already been run. Remove them manually.
-	find 'debian/$(cdbs_curpkg)' -regex '.*/\(dropin\.cache\|*\.py[co]\)' -print0 \
-	| xargs -0 rm -f --
+	# Run tests
+	ln -s ../../../doc \
+		debian/$(cdbs_curpkg)/usr/lib/$(shell pyversions -d)/site-packages/doc
+	$(call cdbs_python_binary,$(shell pyversions -d)) \
+		debian/runtrial.py debian/$(cdbs_curpkg) $(TOPMODULES)
+	rm debian/$(cdbs_curpkg)/usr/lib/$(shell pyversions -d)/site-packages/doc
 endif
+	# Generate documentation
+	cd debian/$(cdbs_curpkg)/usr/doc/howto ; lore *.xhtml */*.xhtml */*/*.xhtml
+	find debian/$(cdbs_curpkg)/usr/doc/howto -name '*.xhtml' -print0 | xargs -0 rm
+	# Remove nit
+	rm debian/$(cdbs_curpkg)/usr/bin/nit
 
 clean::
 	rm -rf _trial_temp

Added: packages/nevow/trunk/debian/runtrial.py
===================================================================
--- packages/nevow/trunk/debian/runtrial.py	                        (rev 0)
+++ packages/nevow/trunk/debian/runtrial.py	2009-03-20 21:52:32 UTC (rev 7937)
@@ -0,0 +1,15 @@
+import sys
+from os.path import join
+from distutils.sysconfig import get_python_lib
+from site import addsitedir
+
+root = sys.argv.pop(1)
+site_packages = get_python_lib()
+
+_path = sys.path[:]
+sys.path[:] = []
+addsitedir(join(root, site_packages[1:]))
+sys.path.extend(_path)
+
+from twisted.scripts.trial import run
+run()