[GRASS-SVN] r62529 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core lib lib/manage scripts vector

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-01 15:38:25 -0700 (Sat, 01 Nov 2014)
New Revision: 62529

Removed:
   grass/branches/releasebranch_7_0/scripts/v.in.sites.all/
Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
   grass/branches/releasebranch_7_0/lib/Makefile
   grass/branches/releasebranch_7_0/lib/manage/element_list
   grass/branches/releasebranch_7_0/lib/manage/option.c
   grass/branches/releasebranch_7_0/scripts/Makefile
   grass/branches/releasebranch_7_0/vector/Makefile
Log:
remove sites element and library - #2440 (merge from trunk, r62179)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:62180,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526
   + /grass/trunk:62179-62180,62487,62491,62494,62506,62508-62509,62515,62519,62521,62526

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-01 22:38:25 UTC (rev 62529)
@@ -429,10 +429,6 @@
                        'labels':'labels',
                        'label':'labels',
                        'paint label files':'labels',
-                       'site_lists':'sites',
-                       'sites':'sites',
-                       'site list':'sites',
-                       'site list files':'sites',
                        'windows':'region',
                        'region':'region',
                        'region definition':'region',

Modified: grass/branches/releasebranch_7_0/lib/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/lib/Makefile	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/lib/Makefile	2014-11-01 22:38:25 UTC (rev 62529)
@@ -27,7 +27,6 @@
 	cluster \
 	rowio \
 	segment \
-	sites \
 	rst \
 	lidar \
 	raster3d \

Modified: grass/branches/releasebranch_7_0/lib/manage/element_list
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/element_list	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/lib/manage/element_list	2014-11-01 22:38:25 UTC (rev 62529)
@@ -24,7 +24,6 @@
   reg:point registration
 dig_ascii:asciivect:asciivector:ASCII vector map(s)
 paint/labels:labels:label:paint label file(s)
-site_lists:sites:site list:site list file(s)
 windows:region:region definition:region definition(s)
 windows3d:region3d:region3D definition:3D region definition(s)
 group:group:imagery group:imagery group(s)

Modified: grass/branches/releasebranch_7_0/lib/manage/option.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/manage/option.c	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/lib/manage/option.c	2014-11-01 22:38:25 UTC (rev 62529)
@@ -50,8 +50,7 @@
     if (strcmp(p->key, "rast") == 0 || strcmp(p->key, "rast3d") == 0)
 	p->guisection = _("Raster");
     else if (strcmp(p->key, "vect") == 0 || strcmp(p->key, "oldvect") == 0 ||
-	     strcmp(p->key, "asciivect") == 0 ||
-	     strcmp(p->key, "sites") == 0)
+	     strcmp(p->key, "asciivect") == 0)
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
 	p->guisection = _("Region");

Modified: grass/branches/releasebranch_7_0/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/scripts/Makefile	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/scripts/Makefile	2014-11-01 22:38:25 UTC (rev 62529)
@@ -65,7 +65,6 @@
 	v.in.gns \
 	v.in.lines \
 	v.in.mapgen \
-	v.in.sites.all \
 	v.in.wfs \
 	v.rast.stats \
 	v.report \

Modified: grass/branches/releasebranch_7_0/vector/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/vector/Makefile	2014-11-01 22:34:11 UTC (rev 62528)
+++ grass/branches/releasebranch_7_0/vector/Makefile	2014-11-01 22:38:25 UTC (rev 62529)
@@ -28,7 +28,6 @@
 	v.in.db \
 	v.in.dxf \
 	v.in.region \
-	v.in.sites \
 	v.kcv \
 	v.kernel \
 	v.label \