# HG changeset patch # User Julien Jehannet # Date 1235071145 -3600 # Node ID e6ae125d590322c05821ed595b2c087b7d2579b6 # Parent f5728ee6fe39c569d7c51637b31ce15366af33e1 reorganize debian packages (Closes: #1168) - Merge cubicweb-core into cubicweb-common - Fix lintian errors - Install bash_completion file correctly - Clean debian/rules diff -r f5728ee6fe39 -r e6ae125d5903 __pkginfo__.py --- a/__pkginfo__.py Thu Feb 19 19:21:26 2009 +0100 +++ b/__pkginfo__.py Thu Feb 19 20:19:05 2009 +0100 @@ -6,11 +6,11 @@ distname = "cubicweb" modname = "cubicweb" -numversion = (3, 0, 4) +numversion = (3, 0, 10) version = '.'.join(str(num) for num in numversion) -license = 'LCL' -copyright = '''Copyright (c) 2003-2008 LOGILAB S.A. (Paris, FRANCE). +license = 'GPL' +copyright = '''Copyright (c) 2003-2009 LOGILAB S.A. (Paris, FRANCE). http://www.logilab.fr/ -- mailto:contact@logilab.fr''' author = "Logilab" @@ -27,11 +27,12 @@ * a bunch of other management tools """ -web = '' -ftp = '' -pyversions = ['2.4'] +web = 'http://www.cubicweb.org' +ftp = 'ftp://ftp.logilab.org/pub/cubicweb' +pyversions = ['2.4', '2.5'] +import sys from os import listdir, environ from os.path import join, isdir import glob @@ -60,7 +61,8 @@ # --home install pydir = 'python' else: - pydir = join('python2.4', 'site-packages') + python_version = '.'.join(str(num) for num in sys.version_info[0:2]) + pydir = join('python' + python_version, 'site-packages') try: data_files = [ @@ -90,7 +92,6 @@ [join('share', 'cubicweb', 'cubes', 'shared', 'i18n'), [join(i18n_dir, fname) for fname in listdir(i18n_dir)]], # skeleton - ] except OSError: # we are in an installed directory, don't care about this diff -r f5728ee6fe39 -r e6ae125d5903 debian/changelog --- a/debian/changelog Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/changelog Thu Feb 19 20:19:05 2009 +0100 @@ -1,3 +1,10 @@ +cubicweb (3.0.10-1) unstable; urgency=low + + * merge cubicweb-core package into cubicweb-common + * simplify debian/rules + + -- Julien Jehannet Thu, 19 Feb 2009 16:24:09 +0100 + cubicweb (3.0.9-1) unstable; urgency=low * new upstream (interim) release diff -r f5728ee6fe39 -r e6ae125d5903 debian/compat --- a/debian/compat Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/compat Thu Feb 19 20:19:05 2009 +0100 @@ -1,1 +1,1 @@ -5 +7 diff -r f5728ee6fe39 -r e6ae125d5903 debian/control --- a/debian/control Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/control Thu Feb 19 20:19:05 2009 +0100 @@ -2,17 +2,19 @@ Section: web Priority: optional Maintainer: Logilab Packaging Team -Uploaders: Sylvain Thenault -Build-Depends: debhelper (>= 5.0.37.1), python (>=2.4), python-dev (>=2.4), python-central (>= 0.5) +Uploaders: Sylvain Thenault , + Julien Jehannet +Build-Depends: debhelper (>= 7), python-dev (>=2.4), python-central (>= 0.5) Standards-Version: 3.8.0 Homepage: http://www.cubicweb.org XS-Python-Version: >= 2.4, << 2.6 + Package: cubicweb Architecture: all XB-Python-Version: ${python:Versions} Depends: ${python:Depends}, cubicweb-server (= ${source:Version}), cubicweb-twisted (= ${source:Version}), cubicweb-client (= ${source:Version}) -XBS-Recommends: (postgresql, postgresql-plpython, postgresql-contrib) | mysql | sqlite3 +XB-Recommends: (postgresql, postgresql-plpython, postgresql-contrib) | mysql | sqlite3 Recommends: postgresql | mysql | sqlite3 Description: the complete CubicWeb framework CubicWeb is a semantic web application framework. @@ -73,7 +75,7 @@ Package: cubicweb-common Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, cubicweb-core (= ${source:Version}), python-logilab-mtconverter (>= 0.4.0), python-simpletal (>= 4.0), graphviz, gettext, python-lxml +Depends: ${python:Depends}, python-logilab-mtconverter (>= 0.4.0), python-simpletal (>= 4.0), graphviz, gettext, python-lxml, python-logilab-common (>= 0.37.2), python-yams (>= 0.20.2), python-rql (>= 0.20.2) Recommends: python-psyco Description: common library for the CubicWeb framework CubicWeb is a semantic web application framework. @@ -85,7 +87,7 @@ Package: cubicweb-ctl Architecture: all XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, cubicweb-core (= ${source:Version}) +Depends: ${python:Depends}, cubicweb-common (= ${source:Version}) Description: tool to manage the CubicWeb framework CubicWeb is a semantic web application framework. . @@ -105,17 +107,6 @@ pyro to connect to a repository server. -Package: cubicweb-core -Architecture: all -XB-Python-Version: ${python:Versions} -Depends: ${python:Depends}, python-logilab-common (>= 0.37.2), python-yams (>= 0.20.2), python-rql (>= 0.20.2) -Description: core library for the CubicWeb framework - CubicWeb is a semantic web application framework. - . - This package provides the core part of the library used by anyone having - to do some cubicweb programming in Python. - - Package: cubicweb-dev Architecture: all XB-Python-Version: ${python:Versions} diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-client.dirs --- a/debian/cubicweb-client.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-client.install.in --- a/debian/cubicweb-client.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-client.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,1 +1,1 @@ -usr/lib/PY_VERSION/site-packages/cubicweb/hercule.py debian/cubicweb-client/usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/hercule.py usr/lib/PY_VERSION/site-packages/cubicweb diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-common.dirs --- a/debian/cubicweb-common.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/lib/python2.4/site-packages/cubicweb/common -usr/share/cubicweb/cubes/shared -usr/share/doc/cubicweb-common diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-common.install.in --- a/debian/cubicweb-common.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-common.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,3 +1,17 @@ -usr/lib/PY_VERSION/site-packages/cubicweb/common/ debian/cubicweb-common/usr/lib/PY_VERSION/site-packages/cubicweb -usr/lib/PY_VERSION/site-packages/cubicweb/entities/ debian/cubicweb-common/usr/lib/PY_VERSION/site-packages/cubicweb -usr/share/cubicweb/cubes/shared/i18n debian/cubicweb-common/usr/share/cubicweb/cubes/shared/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/common/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/entities/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/cubes/shared/i18n usr/share/cubicweb/cubes/shared/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/rset.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/gettext.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/toolsutils.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwvreg.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/_exceptions.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/schemaviewer.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/dbapi.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwconfig.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/__init__.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/md5crypt.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/schema.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/interfaces.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/vregistry.py usr/share/pyshared/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/__pkginfo__.py usr/share/pyshared/cubicweb diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-core.dirs --- a/debian/cubicweb-core.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/share/doc/cubicweb-core diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-ctl.cubicweb.init --- a/debian/cubicweb-ctl.cubicweb.init Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-ctl.cubicweb.init Thu Feb 19 20:19:05 2009 +0100 @@ -11,5 +11,22 @@ # Short-Description: Start cubicweb application at boot time ### END INIT INFO +# FIXME Seems to be inadequate here +# FIXME If related to pyro, try instead: +# export PYRO_STORAGE="/tmp" cd /tmp -/usr/bin/cubicweb-ctl $1 --force + +# FIXME Work-around about the following lintian error +# E: cubicweb-ctl: init.d-script-does-not-implement-required-option /etc/init.d/cubicweb start +# +# Check if we are sure to not want the start-stop-daemon machinery here +# Refer to Debian Policy Manual section 9.3.2 (Writing the scripts) for details. + +case "$1" in + "force-reload") + /usr/bin/cubicweb-ctl reload --force + ;; + "*|restart") + /usr/bin/cubicweb-ctl $1 --force + ;; +esac diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-ctl.install.in --- a/debian/cubicweb-ctl.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-ctl.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,3 +1,3 @@ -usr/bin/cubicweb-ctl debian/cubicweb-ctl/usr/bin/ -usr/lib/PY_VERSION/site-packages/cubicweb/cwctl.py debian/cubicweb-ctl/usr/lib/PY_VERSION/site-packages/cubicweb -debian/cubicweb-ctl.bash_completion debian/cubicweb-ctl/etc/bash_completion.d/cubicweb-ctl +debian/tmp/usr/bin/cubicweb-ctl usr/bin/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/cwctl.py usr/lib/PY_VERSION/site-packages/cubicweb +debian/cubicweb-ctl.bash_completion etc/bash_completion.d/cubicweb-ctl diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-dev.dirs --- a/debian/cubicweb-dev.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb -usr/lib/python2.4/site-packages/cubicweb/common -usr/lib/python2.4/site-packages/cubicweb/web -usr/lib/python2.4/site-packages/cubicweb/server -usr/lib/python2.4/site-packages/cubicweb/sobjects -usr/lib/python2.4/site-packages/cubicweb/entities -usr/share/doc/cubicweb-dev diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-dev.install.in --- a/debian/cubicweb-dev.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-dev.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,7 +1,7 @@ -usr/lib/PY_VERSION/site-packages/cubicweb/devtools/ debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/ -usr/lib/PY_VERSION/site-packages/cubicweb/skeleton/ debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/ -usr/lib/PY_VERSION/site-packages/cubicweb/test debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/ -usr/lib/PY_VERSION/site-packages/cubicweb/common/test debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/common/ -usr/lib/PY_VERSION/site-packages/cubicweb/server/test debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/server/ -usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/test debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ -usr/lib/PY_VERSION/site-packages/cubicweb/web/test debian/cubicweb-dev/usr/lib/PY_VERSION/site-packages/cubicweb/web/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/devtools/ usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/skeleton/ usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/test usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/common/test usr/lib/PY_VERSION/site-packages/cubicweb/common/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/server/test usr/lib/PY_VERSION/site-packages/cubicweb/server/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/test usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/web/test usr/lib/PY_VERSION/site-packages/cubicweb/web/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-documentation.dirs --- a/debian/cubicweb-documentation.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/share/doc/cubicweb-documentation/ -usr/share/doc/cubicweb-documentation/devmanual_fr -usr/share/doc-base/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-documentation.install --- a/debian/cubicweb-documentation.install Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -debian/cubicweb-doc usr/share/doc-base/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-documentation.install.in --- a/debian/cubicweb-documentation.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-documentation.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,1 +1,2 @@ -doc/book debian/cubicweb-documentation/usr/share/doc/cubicweb-documentation +doc/book usr/share/doc/cubicweb-documentation +debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-server.dirs --- a/debian/cubicweb-server.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/lib/python2.4/site-packages/cubicweb/ -usr/share/cubicweb -usr/share/doc/cubicweb-server diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-server.install.in --- a/debian/cubicweb-server.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-server.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,4 +1,4 @@ -usr/lib/PY_VERSION/site-packages/cubicweb/server/ debian/cubicweb-server/usr/lib/PY_VERSION/site-packages/cubicweb -usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ debian/cubicweb-server/usr/lib/PY_VERSION/site-packages/cubicweb -usr/share/cubicweb/schemas/ debian/cubicweb-server/usr/share/cubicweb/ -usr/share/cubicweb/migration/ debian/cubicweb-server/usr/share/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/server/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/sobjects/ usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/schemas/ usr/share/cubicweb/ +debian/tmp/usr/share/cubicweb/migration/ usr/share/cubicweb/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-twisted.dirs --- a/debian/cubicweb-twisted.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -usr/lib/python2.4/site-packages -usr/lib/python2.4/site-packages/cubicweb -usr/share/doc/cubicweb-twisted diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-twisted.install.in --- a/debian/cubicweb-twisted.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-twisted.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/etwist/ debian/cubicweb-twisted/usr/lib/PY_VERSION/site-packages/cubicweb/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/etwist/ usr/lib/PY_VERSION/site-packages/cubicweb/ diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-web.dirs --- a/debian/cubicweb-web.dirs Thu Feb 19 19:21:26 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -usr/lib/python2.4/site-packages/ -usr/lib/python2.4/site-packages/cubicweb -usr/share/cubicweb/cubes/shared -usr/share/doc/cubicweb-web diff -r f5728ee6fe39 -r e6ae125d5903 debian/cubicweb-web.install.in --- a/debian/cubicweb-web.install.in Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/cubicweb-web.install.in Thu Feb 19 20:19:05 2009 +0100 @@ -1,3 +1,3 @@ -usr/lib/PY_VERSION/site-packages/cubicweb/web/ debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/ -usr/share/cubicweb/cubes/shared/data debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ -usr/share/cubicweb/cubes/shared/wdoc debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ +debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/web usr/lib/PY_VERSION/site-packages/cubicweb +debian/tmp/usr/share/cubicweb/cubes/shared/data usr/share/cubicweb/cubes/shared +debian/tmp/usr/share/cubicweb/cubes/shared/wdoc usr/share/cubicweb/cubes/shared diff -r f5728ee6fe39 -r e6ae125d5903 debian/rules --- a/debian/rules Thu Feb 19 19:21:26 2009 +0100 +++ b/debian/rules Thu Feb 19 20:19:05 2009 +0100 @@ -4,12 +4,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +PY_VERSION:=$(shell pyversions -d) + build: build-stamp build-stamp: dh_testdir # XXX doesn't work if logilab-doctools, logilab-xml are not in build depends # and I can't get pbuilder find them in its chroot :( - #cd doc && make + # cd doc && make + # FIXME cleanup and use sphinx-build as build-depends ? python setup.py build touch build-stamp @@ -18,78 +22,42 @@ dh_testroot rm -f build-stamp configure-stamp rm -rf build - rm -rf debian/cubicweb-*/ - find . -name "*.pyc" | xargs rm -f + #rm -rf debian/cubicweb-*/ + find . -name "*.pyc" -delete + rm -f $(basename $(wildcard debian/*.in)) dh_clean -install: build +install: build $(basename $(wildcard debian/*.in)) dh_testdir dh_testroot - dh_clean -k + dh_clean dh_installdirs - ########## core package ############################################# - # put : - # * all the python library and data in cubicweb-core - # * scripts in cubicweb-server - # - # pick from each latter to construct each package - python setup.py -q install_lib --no-compile --install-dir=debian/cubicweb-core/usr/lib/python2.4/site-packages/ - python setup.py -q install_data --install-dir=debian/cubicweb-core/usr/ - python setup.py -q install_scripts --install-dir=debian/cubicweb-server/usr/bin/ - ########## common package ############################################# - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/common/ debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/entities/ debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb - # data - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/i18n debian/cubicweb-common/usr/share/cubicweb/cubes/shared/ + + #python setup.py install_lib --no-compile --install-dir=debian/cubicweb-common/usr/lib/python2.4/site-packages/ + python setup.py -q install --no-compile --prefix=debian/tmp/usr + + # Put all the python library and data in cubicweb-common + # and scripts in cubicweb-server + dh_install -vi + dh_lintian + + # Remove unittests directory (should be available in cubicweb-dev only) + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/server/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/site-packages/cubicweb/sobjects/test + rm -rf debian/cubicweb-web/usr/lib/${PY_VERSION}/site-packages/cubicweb/web/test + rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/common/test + + # cubes directory must be managed as a valid python module + ls -l debian/cubicweb-common/usr/share/cubicweb/cubes touch debian/cubicweb-common/usr/share/cubicweb/cubes/__init__.py - ########## server package ############################################# - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/server/ debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/sobjects/ debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb - # data - mv debian/cubicweb-core/usr/share/cubicweb/schemas/ debian/cubicweb-server/usr/share/cubicweb/ - mv debian/cubicweb-core/usr/share/cubicweb/migration/ debian/cubicweb-server/usr/share/cubicweb/ - ########## twisted package ############################################ - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/etwist/ debian/cubicweb-twisted/usr/lib/python2.4/site-packages/cubicweb/ - ########## web package ################################################ - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/web/ debian/cubicweb-web/usr/lib/python2.4/site-packages/cubicweb/ - # data / web documentation - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/data debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ - mv debian/cubicweb-core/usr/share/cubicweb/cubes/shared/wdoc debian/cubicweb-web/usr/share/cubicweb/cubes/shared/ - ########## ctl package ################################################ - # scripts - mv debian/cubicweb-server/usr/bin/cubicweb-ctl debian/cubicweb-ctl/usr/bin/ - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/cwctl.py debian/cubicweb-ctl/usr/lib/python2.4/site-packages/cubicweb - mv debian/cubicweb-ctl.bash_completion debian/cubicweb-ctl/etc/bash_completion.d/cubicweb-ctl - ########## client package ############################################# - # library - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/hercule.py debian/cubicweb-client/usr/lib/python2.4/site-packages/cubicweb - ########## dev package ################################################ - # devtools package - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/devtools/ debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/skeleton/ debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - # tests directories - mv debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/ - mv debian/cubicweb-common/usr/lib/python2.4/site-packages/cubicweb/common/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/common/ - mv debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb/server/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/server/ - mv debian/cubicweb-server/usr/lib/python2.4/site-packages/cubicweb/sobjects/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/sobjects/ - mv debian/cubicweb-web/usr/lib/python2.4/site-packages/cubicweb/web/test debian/cubicweb-dev/usr/lib/python2.4/site-packages/cubicweb/web/ - ########## documentation package ###################################### - cp -r doc/book debian/cubicweb-documentation/usr/share/doc/cubicweb-documentation/ - ########## core package ############################################### - # small cleanup - rm -rf debian/cubicweb-core/usr/share/cubicweb/ - # undistributed for now - rm -rf debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/goa - rm -rf debian/cubicweb-core/usr/lib/python2.4/site-packages/cubicweb/wsgi + +%: %.in + sed "s/PY_VERSION/${PY_VERSION}/g" < $< > $@ # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot -i - dh_install -i dh_pycentral -i dh_installinit -i -n --name cubicweb -u"defaults 99" dh_installlogrotate -i diff -r f5728ee6fe39 -r e6ae125d5903 doc/book/en/B0020-define-workflows.en.txt --- a/doc/book/en/B0020-define-workflows.en.txt Thu Feb 19 19:21:26 2009 +0100 +++ b/doc/book/en/B0020-define-workflows.en.txt Thu Feb 19 20:19:05 2009 +0100 @@ -155,4 +155,3 @@ defined by the workflow. This transition, as defined in the workflow, will only being displayed for the users belonging to the group moderators of managers. -