[med-svn] r9660 - in trunk/packages/mgltools/cadd/trunk/debian: . patches

[Thorsten Alteholz]

Author: alteholz-guest
Date: 2012-02-13 17:57:33 +0000 (Mon, 13 Feb 2012)
New Revision: 9660

Modified:
   trunk/packages/mgltools/cadd/trunk/debian/changelog
   trunk/packages/mgltools/cadd/trunk/debian/patches/fix_shebangs.patch
   trunk/packages/mgltools/cadd/trunk/debian/patches/remove_ksh.patch
   trunk/packages/mgltools/cadd/trunk/debian/patches/series
   trunk/packages/mgltools/cadd/trunk/debian/rules
Log:
tidy up

Modified: trunk/packages/mgltools/cadd/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/cadd/trunk/debian/changelog	2012-02-12 21:48:02 UTC (rev 9659)
+++ trunk/packages/mgltools/cadd/trunk/debian/changelog	2012-02-13 17:57:33 UTC (rev 9660)
@@ -2,6 +2,8 @@
 
   * New upstream version.
   * debian/control: vcs fields corrected
+  * debian/patches: adapted to new version
+  * debian/rules: adapted to new version
 
  -- Thorsten Alteholz <debian at alteholz.de>  Mon, 06 Feb 2012 18:00:00 +0100
 

Modified: trunk/packages/mgltools/cadd/trunk/debian/patches/fix_shebangs.patch
===================================================================
--- trunk/packages/mgltools/cadd/trunk/debian/patches/fix_shebangs.patch	2012-02-12 21:48:02 UTC (rev 9659)
+++ trunk/packages/mgltools/cadd/trunk/debian/patches/fix_shebangs.patch	2012-02-13 17:57:33 UTC (rev 9660)
@@ -1,16 +1,6 @@
 Description: drop hardcoded python2.x dependency
 Author: Thorsten Alteholz <debian at alteholz.de>
-Last-Update: 2011-07-01
-Index: mgltools-cadd-1.5.6/CADD/bin/runCADD
-===================================================================
---- mgltools-cadd-1.5.6.org/CADD/bin/runCADD 2011-07-01 18:08:33.000000000 +0200
-+++ mgltools-cadd-1.5.6/CADD/bin/runCADD     2011-07-01 18:09:21.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/python
- # $Header: /opt/cvs/CADD/bin/runCADD,v 1.2 2011/01/18 00:56:07 nadya Exp $
- # $Id: runCADD,v 1.2 2011/01/18 00:56:07 nadya Exp $
-
+Last-Update: 2012-02-13
 Index: mgltools-cadd-1.5.6/CADD/bin/CADD
 ===================================================================
 --- mgltools-cadd-1.5.6.org/CADD/bin/CADD    2011-07-01 18:08:38.000000000 +0200

Modified: trunk/packages/mgltools/cadd/trunk/debian/patches/remove_ksh.patch
===================================================================
--- trunk/packages/mgltools/cadd/trunk/debian/patches/remove_ksh.patch	2012-02-12 21:48:02 UTC (rev 9659)
+++ trunk/packages/mgltools/cadd/trunk/debian/patches/remove_ksh.patch	2012-02-13 17:57:33 UTC (rev 9660)
@@ -1,6 +1,16 @@
 Description: replace ksh by python
 Author: Thorsten Alteholz <debian at alteholz.de>
-Last-Update: 2011-07-06
+Last-Update: 2012-02-13
+Index: mgltools-cadd-1.5.6.org/CADD/workflows/visualization/visualization_0.1.1_pmvnet.py
+===================================================================
+--- mgltools-cadd-1.5.6.org/CADD/workflows/visualization/visualization_0.1.1_pmvnet.py	2012-02-13 18:55:53.000000000 +0200
++++ mgltools-cadd-1.5.6.org/CADD/workflows/visualization/visualization_0.1.1_pmvnet.py	2012-02-13 18:56:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/ksh ~/.mgltools/pythonsh
++#!/usr/bin/python
+ ########################################################################
+ #
+ #    Vision Network - Python source code - file generated by vision
 Index: mgltools-cadd-1.5.6.org/CADD/workflows/MDanalysis/NAMDNBCR_0.1_net.py
 ===================================================================
 --- mgltools-cadd-1.5.6.org/CADD/workflows/MDanalysis/NAMDNBCR_0.1_net.py	2011-07-06 18:55:53.000000000 +0200

Modified: trunk/packages/mgltools/cadd/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/cadd/trunk/debian/patches/series	2012-02-12 21:48:02 UTC (rev 9659)
+++ trunk/packages/mgltools/cadd/trunk/debian/patches/series	2012-02-13 17:57:33 UTC (rev 9660)
@@ -1,4 +1,2 @@
-# well meant, but problematic because of symbolic links
-#fix_shebangs.patch
-
+fix_shebangs.patch
 remove_ksh.patch

Modified: trunk/packages/mgltools/cadd/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/cadd/trunk/debian/rules	2012-02-12 21:48:02 UTC (rev 9659)
+++ trunk/packages/mgltools/cadd/trunk/debian/rules	2012-02-13 17:57:33 UTC (rev 9660)
@@ -14,8 +14,7 @@
 
 override_dh_install:
 	dh_install
-	find $(CURDIR)/debian/mgltools-cadd/usr/bin -type f | xargs -r sed -i '1s%.*#!.*%#!/usr/bin%'
-	find $(CURDIR)/debian/mgltools-cadd/usr/bin -type f | xargs -r chmod 755
+	find $(CURDIR)/debian/mgltools-cadd -name runCADD | xargs -r chmod 755
 	find $(CURDIR)/debian/mgltools-cadd -name *.prm -o -name *.res | xargs -r chmod -x
 
 get-orig-source: