[Python-modules-commits] r29447 - in packages/nevow/trunk/debian (8 files)
mithrandi at users.alioth.debian.org
mithrandi at users.alioth.debian.org
Sun Jun 22 18:59:23 UTC 2014
Date: Sunday, June 22, 2014 @ 18:59:22
Author: mithrandi
Revision: 29447
Switch build system from cdbs to dh/pybuild.
Added:
packages/nevow/trunk/debian/clean
packages/nevow/trunk/debian/python-nevow.examples
Modified:
packages/nevow/trunk/debian/changelog
packages/nevow/trunk/debian/compat
packages/nevow/trunk/debian/control
packages/nevow/trunk/debian/rules
Deleted:
packages/nevow/trunk/debian/pycompat
packages/nevow/trunk/debian/runtrial.py
Modified: packages/nevow/trunk/debian/changelog
===================================================================
--- packages/nevow/trunk/debian/changelog 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/changelog 2014-06-22 18:59:22 UTC (rev 29447)
@@ -7,6 +7,7 @@
* Add myself to uploaders.
* Update watch file.
* Fix GPL license path in debian/copyright.
+ * Switch build system from cdbs to dh/pybuild.
-- Tristan Seligmann <mithrandi at debian.org> Sun, 22 Jun 2014 19:17:00 +0200
Added: packages/nevow/trunk/debian/clean
===================================================================
--- packages/nevow/trunk/debian/clean (rev 0)
+++ packages/nevow/trunk/debian/clean 2014-06-22 18:59:22 UTC (rev 29447)
@@ -0,0 +1,3 @@
+nevow/Canvas.swf
+nevow/Canvas.fla
+nevow/canvas.py
Modified: packages/nevow/trunk/debian/compat
===================================================================
--- packages/nevow/trunk/debian/compat 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/compat 2014-06-22 18:59:22 UTC (rev 29447)
@@ -1 +1 @@
-5
+9
Modified: packages/nevow/trunk/debian/control
===================================================================
--- packages/nevow/trunk/debian/control 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/control 2014-06-22 18:59:22 UTC (rev 29447)
@@ -5,20 +5,21 @@
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
Tristan Seligmann <mithrandi at debian.org>
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.90~),
- python (>= 2.6.6-3), python-setuptools (>= 0.6b3)
-Build-Depends-Indep: python-twisted-core (>= 10.1.0-1~),
- python-twisted-web (>= 10.1.0-1~),
- python-twisted-lore
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ python-all,
+ python-setuptools,
+Build-Depends-Indep: python-twisted-core,
+ python-twisted-web,
+ python-twisted-lore,
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/nevow/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/nevow/trunk/
Homepage: http://divmod.org/trac/wiki/DivmodNevow
-X-Python-Version: >= 2.4
+X-Python-Version: >= 2.7
Package: python-nevow
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, dpkg (>= 1.14.17~),
- python-twisted-core (>= 10.1.0-1~), python-twisted-web (>= 10.1.0-1~)
+Depends: ${misc:Depends}, ${python:Depends}, dpkg (>= 1.14.17~)
Provides: ${python:Provides}
Description: Web application templating system for Python and Twisted
Nevow's main focus is on separating the HTML template from both the
Deleted: packages/nevow/trunk/debian/pycompat
===================================================================
--- packages/nevow/trunk/debian/pycompat 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/pycompat 2014-06-22 18:59:22 UTC (rev 29447)
@@ -1 +0,0 @@
-2
Added: packages/nevow/trunk/debian/python-nevow.examples
===================================================================
--- packages/nevow/trunk/debian/python-nevow.examples (rev 0)
+++ packages/nevow/trunk/debian/python-nevow.examples 2014-06-22 18:59:22 UTC (rev 29447)
@@ -0,0 +1 @@
+examples/*
Modified: packages/nevow/trunk/debian/rules
===================================================================
--- packages/nevow/trunk/debian/rules 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/rules 2014-06-22 18:59:22 UTC (rev 29447)
@@ -1,45 +1,28 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+export PYTHONDONTWRITEBYTECODE=yes
+export PYBUILD_NAME=nevow
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+ dh $@ --with python2 --buildsystem=pybuild
-DEB_INSTALL_EXAMPLES_python-nevow := examples/*
-DEB_DH_ALWAYS_EXCLUDE := .svn
-DEB_COMPRESS_EXCLUDE := .py .tac words
-binary-post-install/python-nevow::
- # 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
+override_dh_auto_install:
+ dh_auto_install
+ mkdir -p debian/python-nevow/usr/share/doc/python-nevow
+ mv debian/python-nevow/usr/doc/* debian/python-nevow/usr/share/doc/python-nevow
+ rmdir debian/python-nevow/usr/doc
+ cd debian/python-nevow/usr/share/doc/python-nevow/howto; find . -name '*.xhtml' | xargs lore
+ find debian/python-nevow/usr/share/doc/python-nevow/howto -name '*.xhtml' -delete
+ rm -r debian/python-nevow/usr/share/doc/python-nevow/man
-TOPMODULES:=nevow formless
-install/python-nevow::
- # CDBS and setuptools seems not to be friends with Python 2.6. Move plugins by hand.
- [ ! -d debian/$(cdbs_curpkg)/usr/twisted ] || \
- mv debian/$(cdbs_curpkg)/usr/twisted \
- debian/$(cdbs_curpkg)/usr/lib/$(shell pyversions -d)/site-packages
- # Remove nevow.canvas (see bug #591198)
- rm debian/$(cdbs_curpkg)/usr/lib/$(shell pyversions -d)/site-packages/nevow/Canvas.swf
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- # 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
- find debian/$(cdbs_curpkg)/usr -name dropin.cache -print0 | xargs -0 rm
-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
- mkdir -p debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
- mv debian/$(cdbs_curpkg)/usr/doc/howto debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
- rm -rf debian/$(cdbs_curpkg)/usr/doc
- # Remove nit
- rm debian/$(cdbs_curpkg)/usr/bin/nit
-clean::
- rm -rf _trial_temp
- rm -f setupcommon.pyc
+override_dh_auto_test:
+ ln -s doc .pybuild/pythonX.Y_2.7/build
+ PYBUILD_SYSTEM=custom \
+ PYBUILD_TEST_ARGS="{interpreter} /usr/bin/trial nevow formless" dh_auto_test
+ rm .pybuild/pythonX.Y_2.7/build/doc
+
+
+override_dh_compress:
+ dh_compress -X.py
Deleted: packages/nevow/trunk/debian/runtrial.py
===================================================================
--- packages/nevow/trunk/debian/runtrial.py 2014-06-22 18:28:12 UTC (rev 29446)
+++ packages/nevow/trunk/debian/runtrial.py 2014-06-22 18:59:22 UTC (rev 29447)
@@ -1,16 +0,0 @@
-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:]))
-addsitedir(join(root, site_packages[1:].replace("dist-packages", "site-packages")))
-sys.path.extend(_path)
-
-from twisted.scripts.trial import run
-run()
More information about the Python-modules-commits
mailing list