Simon, a cleaned up version of the patch is attached. Besides the commit message, I've also changed
+usr/lib/python2.*/*-packages/crm/*.py to +usr/lib/python*/*-packages/crm/*.py in the install file. I don't know if the shell is Python 3 clean at this point, but it doesn't hurt to not have to update the install file if and when it is. Cheers, Florian
# HG changeset patch # User Ante Karamatic <[email protected]> # Date 1267738962 0 # Branch sid # Node ID 15572852a8fc9abdadc249e29083089eac180fbb # Parent 2da407f6ee294da02b441e668dda1b4d7dfe7a1e debian: properly include Python modules used by the crm shell Add Python dependencies to Depends. Add crm shell Python modules to installed file list. Add py_central to rules, to properly support the installed Python modules. Note: the Python modules are used exclusively by the crm shell and not by any other applications, hence the omission of a separate python-pacemaker package. diff -r 2da407f6ee29 -r 15572852a8fc debian/control --- a/debian/control Thu Mar 04 21:00:49 2010 +0000 +++ b/debian/control Thu Mar 04 21:42:42 2010 +0000 @@ -10,7 +10,7 @@ Package: pacemaker Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, cluster-agents, python, adduser, corosync (>= 1.1.2) | heartbeat (>= 3.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, cluster-agents, python, adduser, corosync (>= 1.1.2) | heartbeat (>= 3.0) Conflicts: pacemaker-heartbeat, pacemaker-openais Replaces: pacemaker-heartbeat, pacemaker-openais XB-Python-Version: ${python:Versions} diff -r 2da407f6ee29 -r 15572852a8fc debian/pacemaker.install --- a/debian/pacemaker.install Thu Mar 04 21:00:49 2010 +0000 +++ b/debian/pacemaker.install Thu Mar 04 21:42:42 2010 +0000 @@ -85,6 +85,6 @@ usr/share/pacemaker/templates/gfs2 usr/share/pacemaker/templates/gfs2-base usr/share/pacemaker/crm_cli.txt -usr/lib/python2.5/site-packages/crm/*.py +usr/lib/python*/*-packages/crm/*.py usr/share/man/man8/crm_resource.8 usr/share/man/man8/cibadmin.8 diff -r 2da407f6ee29 -r 15572852a8fc debian/rules --- a/debian/rules Thu Mar 04 21:00:49 2010 +0000 +++ b/debian/rules Thu Mar 04 21:42:42 2010 +0000 @@ -151,9 +151,7 @@ dh_makeshlibs -a -V dh_installdeb -a dh_perl -a - # dh_pycentral -a - # dh_python - # dh_pysupport -a `pwd`/usr/lib/pacemaker/cts `pwd`/usr/lib/pacemaker + DH_PYCENTRAL="include-links" dh_pycentral -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a
signature.asc
Description: OpenPGP digital signature
_______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
