remove minor differences to https://trac.osgeo.org/grass/changeset/64155 trunk (probably due to improper backports)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64157 15284696-431f-4ddb-bdfa-cd5b030d7da7

REQUIREMENTS.html

@@ -149,7 +149,7 @@ Ctypes can be added as a third-party module in Python 2.3 and 2.4
 <a href="http://labix.org/python-dateutil">http://labix.org/python-dateutil</a>
 </li>
 
-<li><b>Python PLY Library</b> ("python-ply", needed for the temporal algebra in tgis)<br>
+<li><b>Python PLY Library (Python Lex-Yacc)</b> ("python-ply", needed for the temporal algebra in tgis)<br>
 <a href="http://www.dabeaz.com/ply">http://www.dabeaz.com/ply</a>
 </li>
 

temporal/t.connect/testsuite/test_distr_tgis_db_raster.py

@@ -215,7 +215,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@test1
                                 name=a1
                                 mapset=test1
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-02-01 00:00:00 """
@@ -226,7 +225,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@test2
                                 name=a1
                                 mapset=test2
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-03-01 00:00:00 """
@@ -237,7 +235,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@test3
                                 name=a1
                                 mapset=test3
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-04-01 00:00:00 """
@@ -248,7 +245,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@test4
                                 name=a1
                                 mapset=test4
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-05-01 00:00:00 """

temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py

@@ -161,7 +161,6 @@ class testRaster3dExtraction(TestCase):
         tinfo_string="""id=a1@test3d1
                                 name=a1
                                 mapset=test3d1
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-02-01 00:00:00 """
@@ -172,7 +171,6 @@ class testRaster3dExtraction(TestCase):
         tinfo_string="""id=a1@test3d2
                                 name=a1
                                 mapset=test3d2
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-03-01 00:00:00 """
@@ -183,7 +181,6 @@ class testRaster3dExtraction(TestCase):
         tinfo_string="""id=a1@test3d3
                                 name=a1
                                 mapset=test3d3
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-04-01 00:00:00 """
@@ -194,7 +191,6 @@ class testRaster3dExtraction(TestCase):
         tinfo_string="""id=a1@test3d4
                                 name=a1
                                 mapset=test3d4
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-05-01 00:00:00 """

temporal/t.connect/testsuite/test_distr_tgis_db_vector.py

@@ -171,7 +171,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@testvect1
                                 name=a1
                                 mapset=testvect1
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-02-01 00:00:00 """
@@ -182,7 +181,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@testvect2
                                 name=a1
                                 mapset=testvect2
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-03-01 00:00:00 """
@@ -193,7 +191,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@testvect3
                                 name=a1
                                 mapset=testvect3
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-04-01 00:00:00 """
@@ -204,7 +201,6 @@ class TestRasterExtraction(TestCase):
         tinfo_string="""id=a1@testvect4
                                 name=a1
                                 mapset=testvect4
-                                creator=soeren
                                 temporal_type=absolute
                                 start_time=2001-01-01 00:00:00
                                 end_time=2001-05-01 00:00:00 """

testsuite/raster/raster_md5test.sh

@@ -48,7 +48,7 @@ TMPNAME="`echo ${PID}_tmp_testmap | sed 's+\.+_+g'`"
 cleanup()
 {
  echo "Removing temporary map"
- g.remove -f type=rast name=$TMPNAME > /dev/null
+ g.remove -f type=raster name=$TMPNAME > /dev/null
 }
 
 # check if a MASK is already present:
@@ -68,7 +68,7 @@ finalcleanup()
  #restore user mask if present:
  if test -f $LOCATION/cell/$USERMASK ; then
   echo "Restoring user MASK"
-  g.remove -f type=rast name=MASK > /dev/null
+  g.remove -f type=raster name=MASK > /dev/null
   g.rename raster=$USERMASK,MASK > /dev/null
  fi
 }

testsuite/raster/rhemisphere.sh

@@ -24,7 +24,7 @@ TMP="disk.$$"
 cleanup()
 {
  echo "Removing temporary map"
- g.remove --q -f type=rast name=$TMP > /dev/null
+ g.remove --q -f type=raster name=$TMP > /dev/null
 }
 
 ########################