[med-svn] r2739 - in trunk/packages/mgltools: . opengltk/trunk/debian

[moeller at alioth.debian.org]

Author: moeller
Date: 2008-11-25 18:14:54 +0000 (Tue, 25 Nov 2008)
New Revision: 2739

Modified:
   trunk/packages/mgltools/BUILD
   trunk/packages/mgltools/opengltk/trunk/debian/control
Log:
More fixes to the build process and improved compatibility with Ubuntu.


Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD	2008-11-25 07:20:57 UTC (rev 2738)
+++ trunk/packages/mgltools/BUILD	2008-11-25 18:14:54 UTC (rev 2739)
@@ -285,16 +285,19 @@
 on how to rebuild the non-free architecture-dependent packages across
 architectures.
 
+SUDO=
+#uncomment if not root
+#SUDO=sudo
 # needed for installatation but not a build-dependency
-sudo aptitude install python-pmw python-zsi python-simpy python-imaging-tk
+$SUDO aptitude install python-pmw python-zsi python-simpy python-imaging-tk fakeroot build-essential tk8.4-dev
 # perform the packaging
 for p in \
 	mgltools-bhtree mgltools-sff mgltools-geomutils mgltools-gle \
 	mgltools-pybabel \
 	mgltools-opengltk \
+	mgltools-pyglf \
 	mgltools-dejavu \
 	mgltools-molkit \
-	mgltools-pyglf \
 	mgltools-utpackages mgltools-mglutil mgltools-networkeditor \
 	mgltools-pyautodock \
 	mgltools-scenario \
@@ -309,7 +312,7 @@
 		echo "Package for '$p' is already existing...skipped."
 		sleep 1
 	else
-		sudo apt-get build-dep $p && \
+		$SUDO apt-get build-dep $p && \
 			apt-get source --compile $p && \
 			sudo dpkg -i ${p}_*.deb || break
 	fi

Modified: trunk/packages/mgltools/opengltk/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/control	2008-11-25 07:20:57 UTC (rev 2738)
+++ trunk/packages/mgltools/opengltk/trunk/debian/control	2008-11-25 18:14:54 UTC (rev 2739)
@@ -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, swig (>= 1.3.20), libglu1-mesa-dev, mesa-common-dev, tk-dev, libxmu-dev, python-numpy
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4.49), python2.5-dev, swig (>= 1.3.20), libglu1-mesa-dev, mesa-common-dev, tk8.4-dev|tk8.5-dev|tk-dev, libxmu-dev, python-numpy
 Standards-Version: 3.8.0
 XS-Python-Version: 2.5
 Homepage: http://mgltools.scripps.edu/
@@ -14,7 +14,7 @@
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libglu1-mesa, tk, python-numpy, mgltools-gle
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libglu1-mesa, tk8.4|tk8.5|tk, python-numpy, mgltools-gle
 Description: opengltk python extension
  The library is needed by mgltools-autodocktools at runtime.  It contains
  the interface for building OpenGL python extensions with the python