[med-svn] r2640 - in trunk/packages/mgltools: . autodocktools/trunk/debian molkit/trunk/debian

[smoe-guest at alioth.debian.org]

Author: smoe-guest
Date: 2008-11-09 16:05:44 +0000 (Sun, 09 Nov 2008)
New Revision: 2640

Removed:
   trunk/packages/mgltools/autodocktools/trunk/debian/patches/
Modified:
   trunk/packages/mgltools/BUILD
   trunk/packages/mgltools/autodocktools/trunk/debian/control
   trunk/packages/mgltools/autodocktools/trunk/debian/rules
   trunk/packages/mgltools/molkit/trunk/debian/control
Log:
* Simplified AutoDockTools packaging.
* Fixed last(?) remaining bug in BUILD instructions.


Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD	2008-11-09 15:17:32 UTC (rev 2639)
+++ trunk/packages/mgltools/BUILD	2008-11-09 16:05:44 UTC (rev 2640)
@@ -93,8 +93,10 @@
 with the origDir variable. Alternatively, one can link or move the
 files to their new destination.
 
-	[ -d ../tarballs ] || mkdir ../tarballs
-	mv *.tar.gz ../tarballs
+  [ -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)
 
 Now, to have these tarballs found, the version in the 'debian/changelog'
 files need to match. From debian-med/trunk/packages/mgltools execute
@@ -129,13 +131,12 @@
     support \
     symserv \
     pybabel \
+    bhtree \
     sff \
     mglutil \
     geomutils \
     volume \
-    qslimlib \
     utpackages \
-    bhtree \
     opengltk \
     dejavu \
     pmv \
@@ -144,9 +145,15 @@
     pyautodock \
     autodocktools \
   ; do
-    (cd $p/trunk && svn-b && sudo dpkg -i ../../build-area/mgltools-$p_$VERSIONNAME*.deb)
+    (cd $p/trunk && \
+     svn-buildpackage -us -uc -rfakeroot --svn-ignore && \
+     sudo dpkg -i ../../build-area/mgltools-$p_$VERSIONNAME*.deb)
   done
 
+  # Rejected by FTP-Master
+  #  cmolkit \  -- which should come as GPL
+  #  qslimlib \
+
 The relative path of the build-area may differ on your system. It can
 be set in .svn/deb-layout as buildArea=../../build-area
 

Modified: trunk/packages/mgltools/autodocktools/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/control	2008-11-09 15:17:32 UTC (rev 2639)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/control	2008-11-09 16:05:44 UTC (rev 2640)
@@ -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, quilt
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4.49), python2.5-dev
 Standards-Version: 3.8.0
 XS-Python-Version: 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/autodocktools/trunk/?rev=0&sc=0

Modified: trunk/packages/mgltools/autodocktools/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/rules	2008-11-09 15:17:32 UTC (rev 2639)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/rules	2008-11-09 16:05:44 UTC (rev 2640)
@@ -13,9 +13,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/quilt/quilt.make
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 clean::
 	find . -name CVS -a -type d | xargs -r rm -r

Modified: trunk/packages/mgltools/molkit/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/molkit/trunk/debian/control	2008-11-09 15:17:32 UTC (rev 2639)
+++ trunk/packages/mgltools/molkit/trunk/debian/control	2008-11-09 16:05:44 UTC (rev 2640)
@@ -16,6 +16,7 @@
 XB-Python-Version: ${python:Versions}
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-pybabel, mgltools-dejavu, mgltools-bhtree, mgltools-sff, python-numpy
+Recommends: mgltools-cmolkit
 Suggests: pdb2pqr
 Description: Python classes to read and manipulate molecules
  This package is part of the mgltools set of Python libraries which