[SCM] saga branch, master, updated. baa2856f6ba8e7a46fa78945cb8262b8bcbc4f9d

Johan Van de Wauw johan.vandewauw at gmail.com
Fri Mar 25 23:49:57 UTC 2011


The following commit has been merged in the master branch:
commit baa2856f6ba8e7a46fa78945cb8262b8bcbc4f9d
Merge: 65c2d4754f954d3df704deb0ce33a2bc5ced963a 708e03e916bc510149a05ac4966d97234e476f01
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Mar 26 00:46:27 2011 +0100

    Merge branch 'master' into debian/2.0.6
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 8c9688f,203fd26..b138f65
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,11 +1,13 @@@
 +
  Source: saga
  Section: science
  Priority: optional
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders: Johan Van de Wauw <johan.vandewauw at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
 -Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev, libogdi3.2-dev, 
 - libproj-dev, libgrib2c-dev, debhelper (>=7), cdbs
 -Standards-Version: 3.8.4
 +Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
 + libogdi3.2-dev, libproj-dev|proj, libgrib2c-dev, debhelper (>=7), cdbs,
 + libqhull-dev, libhpdf-dev
 +Standards-Version: 3.9.0
  Homepage: http://www.saga-gis.org/
  Vcs-Git: git://git.debian.org/pkg-grass/saga.git
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
@@@ -15,25 -13,43 +15,43 @@@
  Package: saga
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: System for Automated Geoscientific Analyses
-  SAGA GIS (System for Automated Geoscientific Analyses) is a free and
-  open source geographic information system used for editing and 
-  analysing spatial data. It includes a large number of modules for the
-  analysis of vector (point, line and polygon), table, grid and image 
-  data. Among others the package includes modules for geostatistics, 
-  image classification, projections, simulation of dynamic processes 
-  (hydrology, landscape development) and terrain analysis.
-  The functionality can be accessed through a GUI, the command line or 
-  by using the C++ API.
+ Description: System for Automatic Geoscientific Analysis
+  SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
+  information system usable for editing and analysing spatial data. Among
+  others it includes modules for:
+  . 
+  * File access: interfaces to various table, vector, image and grid file
+    formats.
+  * Filter for grids: gaussian, laplacian, multi direction lee filter.
+  * Gridding: interpolation from vector data using triangulation, nearest
+    neighbour, inverse distance
+  * Geostatistics: residual analysis, ordinary and universal kriging,
+    single and multiple regression analysis, variance analysis.
+  * Grid calculator: combine grids through user defined functions.
+  * Grid discretisation: skeletonisation, segmentation.
+  * Grid tools: merging, resampling, gaps filling.
+  * Image classification:cluster analysis, box classification, maximum
+    likelihood, pattern recognition, region growing.
+  * Projections:various coordinate transformations for vector and grid
+    data (using Proj4 and GeoTrans libraries), georeferencing of grids
+  * Simulation of dynamic processes: TOPMODEL, nitrogen distributions,
+    erosion, landscape development.
+  * Terrain analysis:slope, aspect, curvatures, curvature classification,
+    analytical hillshading, sink eliminition, flow path analysis,
+    catchment delineation, solar radiation, channel lines, relative
+    altitudes.
+  * Vector tools: polygon intersection, contour lines from grid.
  
  Package: libsaga-dev
  Section: libdevel
  Architecture: any
  Suggests: saga (= ${binary:Version})
  Depends: ${shlibs:Depends}, ${misc:Depends}
+ Replaces: libsaga (<< 2.0.4+dfsg-3~)
+ Breaks: libsaga (<< 2.0.4+dfsg-3~)
  Description: SAGA GIS development files
-  SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
-  information system used for editing and analysing spatial data.
+  SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
+  information system usable for editing and analysing spatial data.
   . 
   This package contains the header files for developing with SAGA.
   Install this package if you wish to develop software that uses the SAGA API.
@@@ -42,9 -58,9 +60,9 @@@ Package: libsag
  Section: libs
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
 -Provides: libsaga-2.0.4
 +Provides: libsaga-2.0.6
  Description: SAGA GIS development files
-  SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
-  information system used for editing and analysing spatial data.
+  SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
+  information system usable for editing and analysing spatial data.
   . 
   This package contains the library files for developing with SAGA.
diff --combined debian/control.in
index 9b9540e,a7f2a68..14e8599
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,13 -1,11 +1,13 @@@
 +
  Source: saga
  Section: science
  Priority: optional
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders: Johan Van de Wauw <johan.vandewauw at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
 -Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev, libogdi3.2-dev, 
 - libproj-dev, libgrib2c-dev, debhelper (>=7), cdbs
 -Standards-Version: 3.8.4
 +Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
 + libogdi3.2-dev, libproj-dev|proj, libgrib2c-dev, debhelper (>=7), cdbs,
 + libqhull-dev, libhpdf-dev
 +Standards-Version: 3.9.0
  Homepage: http://www.saga-gis.org/
  Vcs-Git: git://git.debian.org/pkg-grass/saga.git
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
@@@ -15,25 -13,43 +15,27 @@@
  Package: saga
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
 -Description: System for Automatic Geoscientific Analysis
 - SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
 - information system usable for editing and analysing spatial data. Among
 - others it includes modules for:
 - . 
 - * File access: interfaces to various table, vector, image and grid file
 -   formats.
 - * Filter for grids: gaussian, laplacian, multi direction lee filter.
 - * Gridding: interpolation from vector data using triangulation, nearest
 -   neighbour, inverse distance
 - * Geostatistics: residual analysis, ordinary and universal kriging,
 -   single and multiple regression analysis, variance analysis.
 - * Grid calculator: combine grids through user defined functions.
 - * Grid discretisation: skeletonisation, segmentation.
 - * Grid tools: merging, resampling, gaps filling.
 - * Image classification:cluster analysis, box classification, maximum
 -   likelihood, pattern recognition, region growing.
 - * Projections:various coordinate transformations for vector and grid
 -   data (using Proj4 and GeoTrans libraries), georeferencing of grids
 - * Simulation of dynamic processes: TOPMODEL, nitrogen distributions,
 -   erosion, landscape development.
 - * Terrain analysis:slope, aspect, curvatures, curvature classification,
 -   analytical hillshading, sink eliminition, flow path analysis,
 -   catchment delineation, solar radiation, channel lines, relative
 -   altitudes.
 - * Vector tools: polygon intersection, contour lines from grid.
 +Description: System for Automated Geoscientific Analyses
 + SAGA GIS (System for Automated Geoscientific Analyses) is a free and
 + open source geographic information system used for editing and 
 + analysing spatial data. It includes a large number of modules for the
 + analysis of vector (point, line and polygon), table, grid and image 
 + data. Among others the package includes modules for geostatistics, 
 + image classification, projections, simulation of dynamic processes 
 + (hydrology, landscape development) and terrain analysis.
 + The functionality can be accessed through a GUI, the command line or 
 + by using the C++ API.
  
  Package: libsaga-dev
  Section: libdevel
  Architecture: any
  Suggests: saga (= ${binary:Version})
  Depends: ${shlibs:Depends}, ${misc:Depends}
+ Replaces: libsaga (<< 2.0.4+dfsg-3~)
+ Breaks: libsaga (<< 2.0.4+dfsg-3~)
  Description: SAGA GIS development files
 - SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
 - information system usable for editing and analysing spatial data.
 + SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
 + information system used for editing and analysing spatial data.
   . 
   This package contains the header files for developing with SAGA.
   Install this package if you wish to develop software that uses the SAGA API.
@@@ -44,7 -60,7 +46,7 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Provides: libsaga- at VERSION@
  Description: SAGA GIS development files
 - SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
 - information system usable for editing and analysing spatial data.
 + SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
 + information system used for editing and analysing spatial data.
   . 
   This package contains the library files for developing with SAGA.

-- 
Saga GIS



More information about the Pkg-grass-devel mailing list