[med-svn] r2653 - in trunk/packages/mgltools: . autodocktools/trunk/debian mglutil/trunk/debian pmv/trunk/debian pmv/trunk/debian/patches
smoe-guest at alioth.debian.org
smoe-guest at alioth.debian.org
Tue Nov 11 13:41:05 UTC 2008
Author: smoe-guest
Date: 2008-11-11 13:41:05 +0000 (Tue, 11 Nov 2008)
New Revision: 2653
Added:
trunk/packages/mgltools/pmv/trunk/debian/patches/
trunk/packages/mgltools/pmv/trunk/debian/patches/series
trunk/packages/mgltools/pmv/trunk/debian/patches/test_noCommendAfterSlash.patch
Modified:
trunk/packages/mgltools/BUILD
trunk/packages/mgltools/autodocktools/trunk/debian/rules
trunk/packages/mgltools/mglutil/trunk/debian/control
trunk/packages/mgltools/pmv/trunk/debian/control
trunk/packages/mgltools/pmv/trunk/debian/rules
Log:
All the bits that went into the 20081109 upload.
Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD 2008-11-11 13:03:04 UTC (rev 2652)
+++ trunk/packages/mgltools/BUILD 2008-11-11 13:41:05 UTC (rev 2653)
@@ -37,16 +37,18 @@
http://mgltools.scripps.edu/downloads/nightly/documentation/how-to/access-to-cvs
or do what has worked for me the last time around:
- cvs -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs login
+ cvs -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs login
just give an empty password and continue with the download of some sort of a
metapackage ... if you have not perform this checkout before in this folder:
- # perform only if previous checkouts are no longer available.
- cvs -z3 -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs co MGLPACKSDIST
+ # perform only if previous checkouts are no longer available.
+ cvs -z3 -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs co MGLPACKSDIST
Otherwise, if you have an older version checked out already,
-just change to all of the directories and run the "cvs -z3 update":
+just change to all of the directories and run the "cvs -z3 update".
+However, it was found out this to leave out some newly created
+directories.
for i in *; do echo $i; (cd $i && cvs -z3 update); done
@@ -68,22 +70,28 @@
PREVDIST=DIST
VERSIONNAME=1.5.2.cvs.`date +"%Y%m%d" | tr -d '\n'`
NEWDIST=-$VERSIONNAME
+ TARDIR=../tarballs
+ if [ -d "$TARDIR" ]; then
+ echo "Sleeping 5, then removing existing folder '$TARDIR'."
+ sleep 5
+ rm -r "$TARDIR"
+ fi
+ mkdir "$TARDIR"
for i in *$PREVDIST
do
b=`echo $i| sed -e "s/$PREVDIST/$NEWDIST/"`
- echo renaming $i to $b; mv $i $b
+ tfn=`echo $b | sed -e "s/-$VERSIONNAME/_$VERSIONNAME.orig.tar.gz/" | tr 'A-Z' 'a-z'`
+ if [ -z "$tfn" ]; then
+ echo "Something went wrong with the determination of the directory name for '$i'."
+ break
+ else
+ echo temporarily renaming and taring $i to $TARDIR/$tfn; mv $i $b
+ GZIP=-9 tar --exclude CVS -czvf "$TARDIR/$tfn" $b | wc -l
+ mv $b $i
+ echo "done"
+ fi
done
-To prepare the tar files
-
- for d in *; do
- if [ -d "$d" ]; then
- tfn=`echo $d | sed -e "s/-$VERSIONNAME/_$VERSIONNAME.orig.tar.gz/" | tr 'A-Z' 'a-z'`
- echo taring $d to $tfn
- GZIP=-9 tar --exclude CVS -czvf $tfn $d
- fi
- done
-
The removal of the CVS directories is slightly unfortunate since for
upstream these are thought to ensure a closer communication with their
user base.
@@ -93,8 +101,6 @@
with the origDir variable. Alternatively, one can link or move the
files to their new destination.
- [ -d ../tarballs ] || mkdir ../tarballs
- mv *.tar.gz ../tarballs
# Allowing the accession of the tarballs under their Debian package name
(cd ../tarballs && for i in *; do if [ ! -L "$i" ]; then echo "$i"; ln -sf $i mgltools-$i; fi; done)
@@ -143,12 +149,14 @@
gle \
viewerframework \
pyautodock \
- autodocktools \
; do
(cd $p/trunk && \
svn-buildpackage -us -uc -rfakeroot --svn-ignore && \
- sudo dpkg -i ../../build-area/mgltools-$p_$VERSIONNAME*.deb)
+ sudo dpkg -i ../../build-area/mgltools-${p}_${VERSIONNAME}*.deb)
done
+ (cd autodocktools/trunk && \
+ svn-buildpackage -us -uc -rfakeroot --svn-ignore && \
+ sudo dpkg -i ../../build-area/autodocktools_${VERSIONNAME}*.deb)
# Rejected by FTP-Master
# cmolkit \ -- which should come as GPL
Modified: trunk/packages/mgltools/autodocktools/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/rules 2008-11-11 13:03:04 UTC (rev 2652)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/rules 2008-11-11 13:41:05 UTC (rev 2653)
@@ -15,6 +15,9 @@
include /usr/share/cdbs/1/class/python-distutils.mk
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+install::
+ find . -name runAdt | xargs -r chmod +x
+
clean::
find . -name CVS -a -type d | xargs -r rm -r
find . -name runAdt | xargs -r chmod +x
Modified: trunk/packages/mgltools/mglutil/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/control 2008-11-11 13:03:04 UTC (rev 2652)
+++ trunk/packages/mgltools/mglutil/trunk/debian/control 2008-11-11 13:41:05 UTC (rev 2653)
@@ -15,7 +15,7 @@
Package: mgltools-mglutil
XB-Python-Version: ${python:Versions}
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-sff, python-pmw
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-sff, python-pmw, python-zsi
Recommends: qhull-bin
Suggests: tcsh
Description: Molecular Graphics Laboratory utility collection
Modified: trunk/packages/mgltools/pmv/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/control 2008-11-11 13:03:04 UTC (rev 2652)
+++ trunk/packages/mgltools/pmv/trunk/debian/control 2008-11-11 13:41:05 UTC (rev 2653)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
XS-Autobuild: yes
Uploaders: Steffen Moeller <moeller at debian.org>, Sargis Dallakyan <sargis at scripps.edu>
-Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4.49), python2.5-dev
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4.49), python2.5-dev, quilt
Standards-Version: 3.8.0
XS-Python-Version: 2.5
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/pmv/trunk/?rev=0&sc=0
@@ -15,7 +15,7 @@
Package: mgltools-pmv
XB-Python-Version: ${python:Versions}
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-mglutil, mgltools-qslimlib, mgltools-support, mgltools-opengltk, mgltools-molkit, mgltools-viewerframework, mgltools-dejavu
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-mglutil, mgltools-qslimlib, mgltools-support, mgltools-opengltk, mgltools-molkit, mgltools-viewerframework, mgltools-dejavu, python-zsi
Description: Python-based Molecular Viewer
This package is part of the mgltools set of Python libraries which
provide an infrastructure for the analysis of protein structures and
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 2008-11-11 13:41:05 UTC (rev 2653)
@@ -0,0 +1 @@
+test_noCommendAfterSlash.patch -p0
Added: trunk/packages/mgltools/pmv/trunk/debian/patches/test_noCommendAfterSlash.patch
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/patches/test_noCommendAfterSlash.patch (rev 0)
+++ trunk/packages/mgltools/pmv/trunk/debian/patches/test_noCommendAfterSlash.patch 2008-11-11 13:41:05 UTC (rev 2653)
@@ -0,0 +1,16 @@
+Index: Pmv/Tests/test_Misc.py
+===================================================================
+RCS file: /opt/cvs/python/packages/share1.5/Pmv/Tests/test_Misc.py,v
+retrieving revision 1.18
+diff -u -r1.18 test_Misc.py
+--- Pmv/Tests/test_Misc.py 9 Oct 2008 17:11:09 -0000 1.18
++++ Pmv/Tests/test_Misc.py 9 Nov 2008 23:25:25 -0000
+@@ -156,7 +156,7 @@
+ or lSum == 73167704 \
+ or lSum == 73168655 \
+ or lSum == 73163584 \
+- or lSum == 73162930 \ # linux (levi)
++ or lSum == 73162930 \
+ or lSum == 73163729, # MAC OSX (austral)
+ msg='test_SourceTexturedCloudsWithAlpha lSum:%d'%lSum )
+ self.mv.Exit(0)
Modified: trunk/packages/mgltools/pmv/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/rules 2008-11-11 13:03:04 UTC (rev 2652)
+++ trunk/packages/mgltools/pmv/trunk/debian/rules 2008-11-11 13:41:05 UTC (rev 2653)
@@ -13,6 +13,7 @@
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/simple-patchsys.mk
clean::
More information about the debian-med-commit
mailing list