[med-svn] r6163 - in trunk/packages/vmd/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2011-03-05 15:00:00 +0000 (Sat, 05 Mar 2011)
New Revision: 6163

Modified:
   trunk/packages/vmd/trunk/debian/README.source
   trunk/packages/vmd/trunk/debian/control
   trunk/packages/vmd/trunk/debian/patches/plugins_build.patch
   trunk/packages/vmd/trunk/debian/rules
Log:
First successful compilation.


Modified: trunk/packages/vmd/trunk/debian/README.source
===================================================================
--- trunk/packages/vmd/trunk/debian/README.source	2011-03-05 13:45:34 UTC (rev 6162)
+++ trunk/packages/vmd/trunk/debian/README.source	2011-03-05 15:00:00 UTC (rev 6163)
@@ -4,8 +4,10 @@
 VMD will not be redistributed.
 
  * all CVS directories where removed from the sources
+   find . -name "CVS" | xargs -r rm -r
  * the plugin directory was moved into the vmd-$(version)
-   folder
+   folder and named plugins_source
+   mv ../plugins plugin_source
 
 
 

Modified: trunk/packages/vmd/trunk/debian/control
===================================================================
--- trunk/packages/vmd/trunk/debian/control	2011-03-05 13:45:34 UTC (rev 6162)
+++ trunk/packages/vmd/trunk/debian/control	2011-03-05 15:00:00 UTC (rev 6163)
@@ -2,7 +2,7 @@
 Section: non-free/science
 Priority: extra
 Maintainer: Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, tcl8.5-dev
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, tcl8.5-dev, tcsh
 Standards-Version: 3.9.1
 Homepage: http://www.ks.uiuc.edu/Research/vmd/
 #Vcs-Git: git://git.debian.org/collab-maint/vmd.git
@@ -10,7 +10,7 @@
 
 Package: vmd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, tcsh
 Description: presentation of traces of molecular dynamics runs
  VMD stands for Visual Molecular Dynamics. While text books
  and even structure databases because of technical problems only

Modified: trunk/packages/vmd/trunk/debian/patches/plugins_build.patch
===================================================================
--- trunk/packages/vmd/trunk/debian/patches/plugins_build.patch	2011-03-05 13:45:34 UTC (rev 6162)
+++ trunk/packages/vmd/trunk/debian/patches/plugins_build.patch	2011-03-05 15:00:00 UTC (rev 6163)
@@ -1,4 +1,4 @@
-Index: plugins_source/build.csh
+Index: vmd-1.9~beta2/plugins_source/build.csh
 ===================================================================
 --- vmd-1.9~beta2.orig/plugins_source/build.csh	2011-03-05 13:59:24.960662569 +0100
 +++ vmd-1.9~beta2/plugins_source/build.csh	2011-03-05 14:01:56.176662571 +0100

Modified: trunk/packages/vmd/trunk/debian/rules
===================================================================
--- trunk/packages/vmd/trunk/debian/rules	2011-03-05 13:45:34 UTC (rev 6162)
+++ trunk/packages/vmd/trunk/debian/rules	2011-03-05 15:00:00 UTC (rev 6163)
@@ -23,13 +23,26 @@
 %:
 	dh $@ 
 
+export VMDINSTALLBINDIR=/usr/bin
+export VMDINSTALLLIBRARYDIR=/usr/lib/vmd
+export TCL_INCLUDE_DIR=/usr/include/tcl
+DESTDIR=$(CURDIR)/debian/vmd/
+
 override_dh_auto_configure:
 	#FREEBSD FREEBSDAMD64 HPUX11 AIX4 AIX5 AIX5_64 AIX6_64 BLUEWATERS LINUX LINUXALPHA LINUXAMD64 LINUXIA64 LINUXPPC LINUXPPC64 MACOSX MACOSXX86 MACOSXX86_64 TRU64 SOLARIS2 SOLARIS2_64 SOLARISX86 SOLARISX86_64 WIN32 WIN64)
 	echo "Compiling plugins first"
 	cd plugins_source && ./build.csh
-	cd plugins_source && PLUGINDIR=../plugins make distrib
+	-cd plugins_source && PLUGINDIR=`pwd`/../plugins make distrib
+	echo "Setting link from ../plugins to plugins to help compilation"
+	#ln -s $(CURDIR)/plugins_source ../plugins
 	echo "Now configuring core VMD"
-	./configure $(KERNEL)$(PLATFORM)
+	VMDINSTALLBINDIR=$(DESTDIR)$(VMDINSTALLBINDIR) VMDINSTALLLIBRARYDIR=$(DESTDIR)$(VMDINSTALLLIBRARYDIR) TCL_INCLUDE_DIR=/usr/include/tcl ./configure $(KERNEL)$(PLATFORM) GCC NOSTATICPLUGINS TCL
 
 override_dh_auto_build:
-	cd src && make veryclean && make 
+	$(MAKE) -C src veryclean
+	$(MAKE) -C src 
+	ln -f ./$(KERNEL)$(PLATFORM)/vmd_$(KERNEL)$(PLATFORM) bin/vmd
+	$(MAKE) -C src install
+	cd debian/vmd && sed -i "s%`pwd`%%" usr/bin/vmd
+	cd debian/vmd && sed -i "s%/bin/csh%/bin/tcsh%" usr/bin/vmd
+