# HG changeset patch # User David Douard # Date 1375274914 -7200 # Node ID 7ae95f48e2f01f83c6db15aa414a65d342eeeb84 # Parent c99e97e9f566c7cac47fd61cf5d07b29dd929ab7 [pkg] fix debian packaging (closes #3058542) - remove useless Python 2.4 reference, - simplify dh_install configuration to install files consistently instead of having half in /usr/lib/pythonXX and half in /usr/share/pyshared, - incidentally, this makes the package work on squeeze. Regression from eaa58d1c7d5f diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-common.install.in --- a/debian/cubicweb-common.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-common.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/entities/ usr/lib/PY_VERSION/site-packages/cubicweb -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/ext/ usr/lib/PY_VERSION/site-packages/cubicweb -debian/tmp/usr/share/cubicweb/cubes/ usr/share/cubicweb/ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/*.py usr/share/pyshared/cubicweb +usr/lib/PY_VERSION/*-packages/cubicweb/entities/ +usr/lib/PY_VERSION/*-packages/cubicweb/ext/ +usr/share/cubicweb/cubes/ +usr/lib/PY_VERSION/*-packages/cubicweb/*.py diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-ctl.dirs --- a/debian/cubicweb-ctl.dirs Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-ctl.dirs Wed Jul 31 14:48:34 2013 +0200 @@ -1,4 +1,3 @@ -usr/lib/python2.4/site-packages/cubicweb/ etc/init.d etc/cubicweb.d etc/bash_completion.d diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-ctl.install.in --- a/debian/cubicweb-ctl.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-ctl.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,3 +1,3 @@ -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 +usr/bin/cubicweb-ctl usr/bin/ +usr/lib/PY_VERSION/*-packages/cubicweb/cwctl.py +../cubicweb-ctl.bash_completion etc/bash_completion.d/cubicweb-ctl diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-dev.install.in --- a/debian/cubicweb-dev.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-dev.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,10 +1,10 @@ -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/entities/test usr/lib/PY_VERSION/site-packages/cubicweb/entities/ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/ext/test usr/lib/PY_VERSION/site-packages/cubicweb/ext/ -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/hooks/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/ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/etwist/test usr/lib/PY_VERSION/site-packages/cubicweb/etwist/ +usr/lib/PY_VERSION/*-packages/cubicweb/devtools/ +usr/lib/PY_VERSION/*-packages/cubicweb/skeleton/ +usr/lib/PY_VERSION/*-packages/cubicweb/test +usr/lib/PY_VERSION/*-packages/cubicweb/entities/test +usr/lib/PY_VERSION/*-packages/cubicweb/ext/test +usr/lib/PY_VERSION/*-packages/cubicweb/server/test +usr/lib/PY_VERSION/*-packages/cubicweb/sobjects/test +usr/lib/PY_VERSION/*-packages/cubicweb/hooks/test +usr/lib/PY_VERSION/*-packages/cubicweb/web/test +usr/lib/PY_VERSION/*-packages/cubicweb/etwist/test diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-documentation.install.in --- a/debian/cubicweb-documentation.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-documentation.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,3 +1,3 @@ -doc/book usr/share/doc/cubicweb-documentation -doc/html usr/share/doc/cubicweb-documentation -debian/cubicweb-doc usr/share/doc-base/cubicweb-doc +../../doc/book usr/share/doc/cubicweb-documentation +../../doc/html usr/share/doc/cubicweb-documentation +../../debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-server.install.in --- a/debian/cubicweb-server.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-server.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,5 +1,5 @@ -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/hooks/ 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/lib/PY_VERSION/site-packages/cubicweb/schemas/ usr/lib/PY_VERSION/site-packages/cubicweb -debian/tmp/usr/share/cubicweb/migration/ usr/share/cubicweb/ +usr/lib/PY_VERSION/*-packages/cubicweb/server/ +usr/lib/PY_VERSION/*-packages/cubicweb/hooks/ +usr/lib/PY_VERSION/*-packages/cubicweb/sobjects/ +usr/lib/PY_VERSION/*-packages/cubicweb/schemas/ +usr/share/cubicweb/migration/ diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-twisted.install.in --- a/debian/cubicweb-twisted.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-twisted.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,1 +1,1 @@ -debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/etwist/ usr/lib/PY_VERSION/site-packages/cubicweb/ +usr/lib/PY_VERSION/*-packages/cubicweb/etwist/ diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/cubicweb-web.install.in --- a/debian/cubicweb-web.install.in Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/cubicweb-web.install.in Wed Jul 31 14:48:34 2013 +0200 @@ -1,3 +1,3 @@ -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 +usr/lib/PY_VERSION/*-packages/cubicweb/web +usr/share/cubicweb/cubes/shared/data +usr/share/cubicweb/cubes/shared/wdoc diff -r c99e97e9f566 -r 7ae95f48e2f0 debian/rules --- a/debian/rules Wed Jul 31 16:04:10 2013 +0200 +++ b/debian/rules Wed Jul 31 14:48:34 2013 +0200 @@ -37,27 +37,26 @@ dh_clean dh_installdirs - #python setup.py install_lib --no-compile --install-dir=debian/cubicweb-common/usr/lib/python2.4/site-packages/ NO_SETUPTOOLS=1 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_install -vi --sourcedir=debian/tmp # cwctl in the cubicweb-ctl package - rm -f debian/cubicweb-common/usr/share/pyshared/cubicweb/cwctl.py + rm -f debian/cubicweb-common/usr/lib/python*/*/cubicweb/cwctl.py # wdoc in the cubicweb-web package rm -rf debian/cubicweb-common/usr/share/cubicweb/cubes/shared/wdoc rm -rf debian/cubicweb-common/usr/share/cubicweb/cubes/shared/data 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/hooks/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-twisted/usr/lib/${PY_VERSION}/site-packages/cubicweb/etwist/test - rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/ext/test - rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/site-packages/cubicweb/entities/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/*-packages/cubicweb/server/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/*-packages/cubicweb/hooks/test + rm -rf debian/cubicweb-server/usr/lib/${PY_VERSION}/*-packages/cubicweb/sobjects/test + rm -rf debian/cubicweb-web/usr/lib/${PY_VERSION}/*-packages/cubicweb/web/test + rm -rf debian/cubicweb-twisted/usr/lib/${PY_VERSION}/*-packages/cubicweb/etwist/test + rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/*-packages/cubicweb/ext/test + rm -rf debian/cubicweb-common/usr/lib/${PY_VERSION}/*-packages/cubicweb/entities/test %: %.in