tags 585252 + patch tags 586844 + patch thanks NMU debdiff attached
Please note that /usr/bin/runPmv still doesn't work (it doesn't work with python2.5 as well, BTW). It warns about some deprecation warnings, opens a window with a message that AutoLigandCommand module cannot be loaded and then segfaults. I didn't try to fix it as it doesn't seem to be related to #585252. PS site/dist-packages should be cleaned, it contains data files, docs, icons, ... PPS Debian Python policy suggests "python-pmv" as binary package name
diff -u mgltools-pmv-1.5.4.cvs.20090603/debian/control mgltools-pmv-1.5.4.cvs.20090603/debian/control --- mgltools-pmv-1.5.4.cvs.20090603/debian/control +++ mgltools-pmv-1.5.4.cvs.20090603/debian/control @@ -5,9 +5,9 @@ DM-Upload-Allowed: yes XS-Autobuild: yes Uploaders: Steffen Moeller <moel...@debian.org>, Sargis Dallakyan <sar...@scripps.edu> -Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4), python2.5-dev +Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4), python, quilt Standards-Version: 3.8.1 -XS-Python-Version: 2.5 +XS-Python-Version: >= 2.5 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/pmv/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mgltools/pmv/trunk/ Homepage: http://mgltools.scripps.edu/ diff -u mgltools-pmv-1.5.4.cvs.20090603/debian/rules mgltools-pmv-1.5.4.cvs.20090603/debian/rules --- mgltools-pmv-1.5.4.cvs.20090603/debian/rules +++ mgltools-pmv-1.5.4.cvs.20090603/debian/rules @@ -13,11 +13,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk clean:: rm -rf build build-stamp debian/Pmv - find . -name runPmv -exec chmod 755 {} \; + find . -name runPmv -delete find . -name CVS -a -type d | xargs -r rm -r find . -name "*.pdb" -exec chmod 644 {} \; sed -i -e 's/# update the widget entr.*$$/# update the widget entryfields/' Pmv/sdCommands.py diff -u mgltools-pmv-1.5.4.cvs.20090603/debian/changelog mgltools-pmv-1.5.4.cvs.20090603/debian/changelog --- mgltools-pmv-1.5.4.cvs.20090603/debian/changelog +++ mgltools-pmv-1.5.4.cvs.20090603/debian/changelog @@ -1,3 +1,13 @@ +mgltools-pmv (1.5.4.cvs.20090603-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add fix_shebangs.patch and change XS-Python-Version to >= 2.5 + (closes: #586844) + * Remove runPmv file in clean rule + * Add fix_string_exceptions.patch (closes: #585252) + + -- Piotr Ożarowski <pi...@debian.org> Wed, 30 Jun 2010 20:05:07 +0200 + mgltools-pmv (1.5.4.cvs.20090603-1) unstable; urgency=low * New upstream version. only in patch2: unchanged: --- mgltools-pmv-1.5.4.cvs.20090603.orig/debian/patches/fix_string_exceptions.patch +++ mgltools-pmv-1.5.4.cvs.20090603/debian/patches/fix_string_exceptions.patch @@ -0,0 +1,22 @@ +Index: mgltools-pmv-1.5.4.cvs.20090603/Pmv/amberCommands.py +=================================================================== +--- mgltools-pmv-1.5.4.cvs.20090603.orig/Pmv/amberCommands.py ++++ mgltools-pmv-1.5.4.cvs.20090603/Pmv/amberCommands.py +@@ -1244,7 +1244,7 @@ class ConstrainAtomsAmber94(MVCommand): + print 'in updateLabels' + if numConstr==None: + print 'skipping update to None' +- raise 'abc' ++ raise Exception('abc') + return + cstr = 'Currently ' + str(numConstr) + ' constrained Atoms' + for c in [self.vf.minimize_Amber94, self.vf.md_Amber94, self]: +@@ -2754,7 +2754,7 @@ class FixAmberResNamesAndOrderAtomsComma + else: + msg = res.name + ' has extra atoms ' + #self.warningMsg(msg) +- raise msg ++ raise Exception(msg) + + + def doit(self, nodes): only in patch2: unchanged: --- mgltools-pmv-1.5.4.cvs.20090603.orig/debian/patches/fix_shebangs.patch +++ mgltools-pmv-1.5.4.cvs.20090603/debian/patches/fix_shebangs.patch @@ -0,0 +1,23 @@ +Index: mgltools-pmv-1.5.4.cvs.20090603/Pmv/bin/pmv +=================================================================== +--- mgltools-pmv-1.5.4.cvs.20090603.orig/Pmv/bin/pmv ++++ mgltools-pmv-1.5.4.cvs.20090603/Pmv/bin/pmv +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.5 ++#!/usr/bin/env python + # + # $Header: /opt/cvs/python/packages/share1.5/Pmv/bin/pmv,v 1.12 2007/10/29 21:26:57 vareille Exp $ + # $Id: pmv,v 1.12 2007/10/29 21:26:57 vareille Exp $ +Index: mgltools-pmv-1.5.4.cvs.20090603/setup.py +=================================================================== +--- mgltools-pmv-1.5.4.cvs.20090603.orig/setup.py ++++ mgltools-pmv-1.5.4.cvs.20090603/setup.py +@@ -43,7 +43,7 @@ class modified_build_scripts(build_scrip + forig = open(script+".py", "r") + txt = forig.readlines() + forig.close() +- fnew.write("#!/usr/bin/env python2.4\n") ++ fnew.write("#!/usr/bin/env python\n") + fnew.writelines(txt) + fnew.close() + build_scripts.copy_scripts(self) only in patch2: unchanged: --- mgltools-pmv-1.5.4.cvs.20090603.orig/debian/patches/series +++ mgltools-pmv-1.5.4.cvs.20090603/debian/patches/series @@ -0,0 +1,2 @@ +fix_shebangs.patch +fix_string_exceptions.patch
signature.asc
Description: Digital signature
