[med-svn] r6480 - in trunk/packages/mgltools/autodocktools/trunk/debian: . patches source

Andreas Tille tille at alioth.debian.org
Thu Apr 7 09:06:24 UTC 2011 

Author: tille
Date: 2011-04-07 09:06:11 +0000 (Thu, 07 Apr 2011)
New Revision: 6480

Added:
   trunk/packages/mgltools/autodocktools/trunk/debian/patches/
   trunk/packages/mgltools/autodocktools/trunk/debian/patches/fix_python_path.patch
   trunk/packages/mgltools/autodocktools/trunk/debian/patches/series
   trunk/packages/mgltools/autodocktools/trunk/debian/source/
   trunk/packages/mgltools/autodocktools/trunk/debian/source/format
Removed:
   trunk/packages/mgltools/autodocktools/trunk/debian/pycompat
Modified:
   trunk/packages/mgltools/autodocktools/trunk/debian/changelog
   trunk/packages/mgltools/autodocktools/trunk/debian/compat
   trunk/packages/mgltools/autodocktools/trunk/debian/control
   trunk/packages/mgltools/autodocktools/trunk/debian/rules
Log:
Basically fix #616740 to switch from python-central to python-support2; other packaging updates and lintian fixes


Modified: trunk/packages/mgltools/autodocktools/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/changelog	2011-04-07 06:22:53 UTC (rev 6479)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/changelog	2011-04-07 09:06:11 UTC (rev 6480)
@@ -1,3 +1,22 @@
+autodocktools (1.5.4.cvs.20100912-3) unstable; urgency=low
+
+  * Added myself to Uploaders
+  * Debhelper 8 (control+compat)
+  * debian/source/format: 3.0 (quilt)
+  * debian/control: Build-Depends: python (>= 2.6) to enable
+    python-support2
+  * debian/rules: switch to short dh syntax which makes
+    dh_python2 easy
+    Closes: #616740
+  * debian/pycompat: removed
+  * debian/rules:
+    - Make sure build process will not introduce unwanted versioned
+      Python interpreter
+    - Clean target remove copy of runAdt which is created in build
+      process
+
+ -- Andreas Tille <tille at debian.org>  Wed, 06 Apr 2011 23:08:06 +0200
+
 autodocktools (1.5.4.cvs.20100912-2) unstable; urgency=low
 
   * Removed dependency on mgltools-scenario2, which will only

Modified: trunk/packages/mgltools/autodocktools/trunk/debian/compat
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/compat	2011-04-07 06:22:53 UTC (rev 6479)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/compat	2011-04-07 09:06:11 UTC (rev 6480)
@@ -1 +1 @@
-5
+8

Modified: trunk/packages/mgltools/autodocktools/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/control	2011-04-07 06:22:53 UTC (rev 6479)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/control	2011-04-07 09:06:11 UTC (rev 6480)
@@ -4,18 +4,19 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 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), python-all
-Standards-Version: 3.9.1.0
+Uploaders: Steffen Moeller <moeller at debian.org>,
+ Sargis Dallakyan <sargis at scripps.edu>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 8), python (>= 2.6), quilt (>= 0.47)
+Standards-Version: 3.9.1
 XS-Python-Version: >= 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/autodocktools/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mgltools/autodocktools/trunk/
 Homepage: http://autodock.scripps.edu/
 
 Package: autodocktools
-XB-Python-Version: ${python:Versions}
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mgltools-pmv, mgltools-molkit, mgltools-volume, mgltools-support, python-imaging-tk, mgltools-viewerframework, mgltools-scenario2
+Depends: ${misc:Depends}, ${python:Depends}, mgltools-pmv, mgltools-molkit, mgltools-volume, mgltools-support, python-imaging-tk, mgltools-viewerframework
 Recommends: mgltools-pyautodock, mgltools-utpackages
 Suggests: autodock
 Description: GUI to help set up, launch and analyze AutoDock dockings

Added: trunk/packages/mgltools/autodocktools/trunk/debian/patches/fix_python_path.patch
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/patches/fix_python_path.patch	                        (rev 0)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/patches/fix_python_path.patch	2011-04-07 09:06:11 UTC (rev 6480)
@@ -0,0 +1,24 @@
+--- autodocktools-1.5.4.cvs.20100912.orig/AutoDockTools/bin/adt
++++ autodocktools-1.5.4.cvs.20100912/AutoDockTools/bin/adt
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/python
+ #
+ 
+ import sys
+--- autodocktools-1.5.4.cvs.20100912.orig/AutoDockTools/bin/adt3
++++ autodocktools-1.5.4.cvs.20100912/AutoDockTools/bin/adt3
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/python
+ #
+ import sys, getopt
+ 
+--- autodocktools-1.5.4.cvs.20100912.orig/AutoDockTools/bin/adt4
++++ autodocktools-1.5.4.cvs.20100912/AutoDockTools/bin/adt4
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/python
+ #
+ import sys, getopt
+ 

Added: trunk/packages/mgltools/autodocktools/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/patches/series	2011-04-07 09:06:11 UTC (rev 6480)
@@ -0,0 +1 @@
+fix_python_path.patch

Deleted: trunk/packages/mgltools/autodocktools/trunk/debian/pycompat
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/pycompat	2011-04-07 06:22:53 UTC (rev 6479)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/pycompat	2011-04-07 09:06:11 UTC (rev 6480)
@@ -1 +0,0 @@
-2

Modified: trunk/packages/mgltools/autodocktools/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/rules	2011-04-07 06:22:53 UTC (rev 6479)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/rules	2011-04-07 09:06:11 UTC (rev 6480)
@@ -4,16 +4,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_PYTHON_SYSTEM=pycentral
+%:
+	dh $@ --with python2 --with quilt
 
-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
+override_dh_install:
+	dh_install
+	find debian -name runAdt -exec chmod +x \{\} \;
+	# remove extra interpreter line
+	find debian -name runAdt -type f -exec sed -i 's?#!/usr/bin/env python2.4?#!/usr/bin/python?' \{\} \;
+	find debian -name LICENSE -delete
 
-install::
-	a=`find debian -name runAdt` && chmod +x $$a
-
-clean::
+override_dh_clean:
+	dh_clean
 	find . -name CVS -a -type d | xargs -r rm -r
 	find debian -name runAdt | xargs -r chmod +x
+	rm -f AutoDockTools/bin/runAdt
 	rm -rf build build-stamp

Added: trunk/packages/mgltools/autodocktools/trunk/debian/source/format
===================================================================
--- trunk/packages/mgltools/autodocktools/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/mgltools/autodocktools/trunk/debian/source/format	2011-04-07 09:06:11 UTC (rev 6480)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the debian-med-commit mailing list