[QGIS Commit] r11567 - in trunk/qgis: debian src/analysis src/plugins/raster_terrain_analysis

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-09-05 11:47:54 -0400 (Sat, 05 Sep 2009)
New Revision: 11567

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/debian/libqgis1.3.0.install
   trunk/qgis/src/analysis/CMakeLists.txt
   trunk/qgis/src/plugins/raster_terrain_analysis/CMakeLists.txt
Log:
debian packaging update

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-09-05 15:42:43 UTC (rev 11566)
+++ trunk/qgis/debian/changelog	2009-09-05 15:47:54 UTC (rev 11567)
@@ -1,9 +1,10 @@
 qgis (1.3.0) UNRELEASED; urgency=low
 
   * new development version after 1.2 branch
-  * add raster terrain analysis plugin
+  * add analysis library and raster terrain analysis plugin
+  * alternativly depend on libgdal1-1.6.0-grass
 
- -- Jürgen E. Fischer <jef at norbit.de>  Wed, 26 Aug 2009 21:10:10 +0200
+ -- Jürgen E. Fischer <jef at norbit.de>  Sat, 05 Sep 2009 17:45:21 +0200
 
 qgis (1.2.0) UNRELEASED; urgency=low
 

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2009-09-05 15:42:43 UTC (rev 11566)
+++ trunk/qgis/debian/control	2009-09-05 15:47:54 UTC (rev 11567)
@@ -70,7 +70,7 @@
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass | libgdal1-1.6.0-grass
 Description: GRASS plugin for Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/libqgis1.3.0.install
===================================================================
--- trunk/qgis/debian/libqgis1.3.0.install	2009-09-05 15:42:43 UTC (rev 11566)
+++ trunk/qgis/debian/libqgis1.3.0.install	2009-09-05 15:47:54 UTC (rev 11567)
@@ -1,2 +1,3 @@
 usr/lib/libqgis_core.so.*.*.*
 usr/lib/libqgis_gui.so.*.*.*
+usr/lib/libqgis_analysis.so.*.*.*

Modified: trunk/qgis/src/analysis/CMakeLists.txt
===================================================================
--- trunk/qgis/src/analysis/CMakeLists.txt	2009-09-05 15:42:43 UTC (rev 11566)
+++ trunk/qgis/src/analysis/CMakeLists.txt	2009-09-05 15:47:54 UTC (rev 11567)
@@ -63,6 +63,7 @@
 			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
 			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
 
+SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
 
 # because of htonl
 IF (WIN32)

Modified: trunk/qgis/src/plugins/raster_terrain_analysis/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/raster_terrain_analysis/CMakeLists.txt	2009-09-05 15:42:43 UTC (rev 11566)
+++ trunk/qgis/src/plugins/raster_terrain_analysis/CMakeLists.txt	2009-09-05 15:47:54 UTC (rev 11567)
@@ -37,6 +37,7 @@
      ../../core 
      ../../core/raster 
      ../../gui
+     ../../analysis/raster
      ..
      .
 )