Merge branch 'master' into develop

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: GridR
 Type: Package
 Title: Executes functions on remote hosts, clusters or grids. 
-Version: 0.9.11
-Date: 2014-01-28
+Version: 0.9.12
+Date: 2014-02-03
 Author: Dennis Wegener, Malte Lohmeyer, Stefan Rueping, Derek Weitzel
 Maintainer: Dennis Wegener <[email protected]>
 Description: GridR is an R-Package that can be used to submit R functions for execution on remote computers, clusters or grids. In addition, users are provided with an interface to share variables and functions with other users.

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 echo "By using the GridR package you agree to the listed terms and conditions below:"
 echo "#########################################"
-echo " 	GridR package 0.9.11"
+echo " 	GridR package 0.9.12"
 echo " "
 echo " "
 echo "Copyright (C) 2008 Fraunhofer Institute Intelligent Analysis and Information Systems IAIS," 

inst/GridR/R-bootstrap.py

@@ -30,6 +30,7 @@
 # download URLs for the different platforms
 URL_DICT={
   DEB6: "http://osg-xsede.grid.iu.edu/software/boscor/deb6-modified.tar.gz",
+  DEB7: "http://osg-xsede.grid.iu.edu/software/boscor/deb6-modified.tar.gz",
   RH5: "http://osg-xsede.grid.iu.edu/software/boscor/el5-R-modified.tar.gz",
   RH6: "http://osg-xsede.grid.iu.edu/software/boscor/el6-R-modified.tar.gz",
   UNKNOWN: "UNKNOWN Platform"
@@ -128,6 +129,8 @@ def findversion():
       if mydist[0].lower() == 'debian':
         if mydist[1].startswith('6.'):
           return DEB6
+        elif mydist[1].startswith('7.'):
+          return DEB7
     if os.path.isfile('/etc/redhat-release'):
       return findversion_redhat()
     elif os.path.isfile('/etc/lsb-release'):

man/GridR-package.Rd

@@ -16,8 +16,8 @@ All needed functions and variables that are necessary to execute that function w
 \tabular{ll}{
 Package: \tab GridR\cr
 Type: \tab Package\cr
-Version: \tab 0.9.10\cr
-Date: \tab 2014-01-28\cr
+Version: \tab 0.9.12\cr
+Date: \tab 2014-02-03\cr
 License: \tab GPL-2\cr
 }
 With grid.init(...) GridR is initialized.