[med-svn] r4979 - in trunk/packages/mgltools/pmv/trunk/debian: . patches
Piotr Ożarowski
piotr at alioth.debian.org
Thu Jul 1 20:21:30 UTC 2010
Author: piotr
Date: 2010-07-01 20:21:30 +0000 (Thu, 01 Jul 2010)
New Revision: 4979
Added:
trunk/packages/mgltools/pmv/trunk/debian/patches/
trunk/packages/mgltools/pmv/trunk/debian/patches/fix_shebangs.patch
trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch
trunk/packages/mgltools/pmv/trunk/debian/patches/series
Modified:
trunk/packages/mgltools/pmv/trunk/debian/changelog
trunk/packages/mgltools/pmv/trunk/debian/control
trunk/packages/mgltools/pmv/trunk/debian/rules
Log:
* Add fix_shebangs.patch and change XS-Python-Version to >= 2.5 (closes: #586844)
* Add fix_string_exceptions.patch (closes: #585252)
* Remove runPmv file in clean rule
Modified: trunk/packages/mgltools/pmv/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/changelog 2010-07-01 19:58:37 UTC (rev 4978)
+++ trunk/packages/mgltools/pmv/trunk/debian/changelog 2010-07-01 20:21:30 UTC (rev 4979)
@@ -7,6 +7,16 @@
-- Andreas Tille <tille at debian.org> Fri, 16 Oct 2009 22:18:24 +0200
+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 <piotr at debian.org> Wed, 30 Jun 2010 20:05:07 +0200
+
mgltools-pmv (1.5.4.cvs.20090603-1) unstable; urgency=low
* New upstream version.
Modified: trunk/packages/mgltools/pmv/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/control 2010-07-01 19:58:37 UTC (rev 4978)
+++ trunk/packages/mgltools/pmv/trunk/debian/control 2010-07-01 20:21:30 UTC (rev 4979)
@@ -6,9 +6,9 @@
XS-Autobuild: yes
Uploaders: Steffen Moeller <moeller at debian.org>, Sargis Dallakyan <sargis at scripps.edu>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), python-central (>= 0.5.6), cdbs (>= 0.4), python2.5-dev
+Build-Depends: debhelper (>= 7), python-central (>= 0.5.6), cdbs (>= 0.4), python, quilt
Standards-Version: 3.8.3
-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/
Added: trunk/packages/mgltools/pmv/trunk/debian/patches/fix_shebangs.patch
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/patches/fix_shebangs.patch (rev 0)
+++ trunk/packages/mgltools/pmv/trunk/debian/patches/fix_shebangs.patch 2010-07-01 20:21:30 UTC (rev 4979)
@@ -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)
Added: trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch (rev 0)
+++ trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch 2010-07-01 20:21:30 UTC (rev 4979)
@@ -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):
Added: trunk/packages/mgltools/pmv/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/patches/series (rev 0)
+++ trunk/packages/mgltools/pmv/trunk/debian/patches/series 2010-07-01 20:21:30 UTC (rev 4979)
@@ -0,0 +1,2 @@
+fix_shebangs.patch
+fix_string_exceptions.patch
Modified: trunk/packages/mgltools/pmv/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/rules 2010-07-01 19:58:37 UTC (rev 4978)
+++ trunk/packages/mgltools/pmv/trunk/debian/rules 2010-07-01 20:21:30 UTC (rev 4979)
@@ -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
More information about the debian-med-commit
mailing list