On Apr 28, 2011, at 12:58 AM, Daniel Leidert wrote: >Am Mittwoch, den 27.04.2011, 17:16 -0400 schrieb Barry Warsaw: > >> I've worked up a patch for bug 616742, which converts avogadro from >> python-central to dh_python2. I've tested this and it works for me locally. >> Note that this does not fix the packaging to build for multiple versions of >> Python, but seeing as Python 2.6 is currently the default for Wheezy, that >> should be fine for now. >> >> Please let me know what you think. > >The patch has a few issues, e.g. it hardcodes the python version in >debian/python-avogadro.install (the change here is useless - please >leave it as it is),
Done. >which might lead to an FTBFS in the future. Another thing that comes to my >mind is: Why is X-Python-Version >= 2.5 when we only build for the current >version (2.6 or newer)? This should be set in an automated way and not >hardcoded. AFAICT, avogadro is only able to build for one version of Python; it can't build for both Python 2.6 and 2.7. At least, not the way the rules file is currently written. As for why I picked 2.5, I thought that was avogadro's minimum Python requirement, and dh_python2 doesn't support 'all' or 'current' in X-Python-Version. In practice, if you're only going to build for the current default version of Python, you don't need this line at all, so I've removed it. (I don't know whether dh_python2 supports an automatic X-Python-Version, but I'm trying to find that answer.) >I further see some differences to `man dh_python2', but I didn't >figure them out yet - e.g. including python-distutils.mk. Right, you don't want to include python-distutils.mk because python-avogadro isn't distutils-based, i.e. there is no setup.py file. >JFTR: We should finally change to dh 7 for avogadro. Agreed, that would be nicer, but I thought that would be inappropriate for my patch. I've attached an updated diff. Cheers, -Barry
=== modified file 'debian/changelog' --- debian/changelog 2011-04-24 01:00:16 +0000 +++ debian/changelog 2011-04-25 18:22:45 +0000 @@ -1,3 +1,9 @@ +avogadro (1.0.2-2) unstable; urgency=low + + * Convert to dh_python2. (Closes: #616742) + + -- Barry Warsaw <[email protected]> Mon, 25 Apr 2011 14:22:01 -0400 + avogadro (1.0.2-1) unstable; urgency=low * New upstream release. === modified file 'debian/control' --- debian/control 2011-04-24 01:00:16 +0000 +++ debian/control 2011-04-29 18:10:12 +0000 @@ -5,13 +5,12 @@ Uploaders: Jordan Mantha <[email protected]>, Michael Banck <[email protected]>, Daniel Leidert (dale) <[email protected]> -Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.38), cmake (>= 2.6.0), +Build-Depends: cdbs (>= 0.4.90-1~), debhelper (>= 5.0.38), cmake (>= 2.6.0), patchutils, pkg-config, libboost-python-dev, libeigen2-dev (>= 2.0~beta6), libglew1.5-dev, libqt4-dev (>= 4.5.0), qt4-dev-tools, zlib1g-dev, - libqt4-opengl-dev, libopenbabel-dev (>= 2.2.0), python-dev, python-central, - python-numpy, python-sip-dev + libqt4-opengl-dev, libopenbabel-dev (>= 2.2.0), python-dev, + python-numpy, python-sip-dev, python (>= 2.6.6-3~) Standards-Version: 3.9.1 -XS-Python-Version: current Homepage: http://avogadro.sourceforge.net/ Vcs-Browser: http://svn.debian.org/wsvn/debichem/ Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/avogadro/ @@ -86,7 +85,6 @@ Replaces: libavogadro0 (<< 0.9.8) Conflicts: libavogadro0 (<< 0.9.8) Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} Description: Molecular Graphics and Modelling System (Python module) Avogadro is a molecular graphics and modelling system targetted at small to medium molecules. It can visualize properties like molecular orbitals or === modified file 'debian/rules' --- debian/rules 2010-05-19 18:35:43 +0000 +++ debian/rules 2011-04-29 18:30:59 +0000 @@ -20,7 +20,7 @@ DEB_DH_GENCONTROL_ARGS_python-avogadro = -- -V'pyavo:Depends=python$(PYVER)-numpy, python$(PYVER)-qt4, python$(PYVER)-sip' binary-install/python-avogadro:: - dh_pycentral -ppython-avogadro + dh_python2 -ppython-avogadro --no-guessing-versions dh_sip common-binary-post-install-arch:: list-missing
signature.asc
Description: PGP signature
