[DebianGIS-dev] [SCM] saga branch, master, updated. 3450f7f0000f87261c9780b4ef69dc54fc68c327

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit 320995d7eab221f792aec400b2dd56ae33556eed
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Mon Mar 1 10:53:44 2010 +0100

    Build separate libsaga4 package
    
    I also removed the rules to find the version number: they would not
    change the install file, and it is not yet clear how upstream will
    arrange this.

diff --git a/debian/control b/debian/control
index a40be2f..a0a397b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
 Package: saga
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga_api4
-Provides: libsaga_gdi0
 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
@@ -42,14 +40,25 @@ Description: System for Automatic Geoscientific Analysis
    altitudes.
  * Vector tools: polygon intersection, contour lines from grid.
 
-Package: saga-dev
-Section: devel
+Package: libsaga4-dev
+Section: libdevel
 Architecture: any
-Depends: saga (= ${binary:Version})
-Provides: saga at VERSION@-dev
+Suggests: saga (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: SAGA GIS development files
  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.
+
+Package: libsaga4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libsaga
+Description: SAGA GIS development files
+ 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 --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index b681ac7..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,54 +0,0 @@
-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
-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
-
-Package: saga
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga_api at LIBSAGAAPISO@
-Provides: libsaga_gdi at LIBSAGAGDISO@
-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: saga-dev
-Section: devel
-Architecture: any
-Depends: saga (= ${binary: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.
- . 
- This package contains the header files for developing with SAGA.
- Install this package if you wish to develop software that uses the SAGA API.
diff --git a/debian/libsaga4.install b/debian/libsaga4.install
new file mode 100644
index 0000000..72583d5
--- /dev/null
+++ b/debian/libsaga4.install
@@ -0,0 +1 @@
+/usr/lib/libsaga*
diff --git a/debian/rules b/debian/rules
index 97d20d6..0a5c87c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/cdbs/1/class/autotools.mk
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-unicode
 DEB_INSTALL_MANPAGES_saga = saga_cmd.1
 
-LIBSAGAAPISO := $(shell grep '^SOVERSION =' src/saga_core/saga_api/Makefile.am | sed 's/SOVERSION = \([0-9]*\):[0-9]*:[0-9]*/\1/g')
-LIBSAGAGDISO := $(shell grep '^SOVERSION =' src/saga_core/saga_gdi/Makefile.am | sed 's/SOVERSION = \([0-9]*\):[0-9]*:[0-9]*/\1/g')
-
 # remove libtool helpers
 binary/saga::
 	find debian/saga/usr/lib ! -type d -a -name "*.la" -delete
diff --git a/debian/saga.install b/debian/saga.install
index be813ca..e49a0ec 100644
--- a/debian/saga.install
+++ b/debian/saga.install
@@ -3,4 +3,4 @@ src/saga_core/saga_gui/res/xpm/saga_icon_16.xpm  /usr/share/pixmaps/
 debian/saga_gui.desktop  /usr/share/applications/
 src/saga_core/saga_gui/res/saga_tip.txt /usr/share/saga/
 usr/bin
-usr/lib
+usr/lib/saga/*

-- 
Saga GIS