debian packaging update

jef · jef · commit 76ddea96e566 · 2009-09-05T15:47:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11567 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/debian/changelog b/debian/changelog
@@ -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@norbit.de>  Wed, 26 Aug 2009 21:10:10 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 05 Sep 2009 17:45:21 +0200
 
 qgis (1.2.0) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files
 
 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.
diff --git a/debian/libqgis1.3.0.install b/debian/libqgis1.3.0.install
@@ -1,2 +1,3 @@
 usr/lib/libqgis_core.so.*.*.*
 usr/lib/libqgis_gui.so.*.*.*
+usr/lib/libqgis_analysis.so.*.*.*
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -63,6 +63,7 @@ SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
 			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)
diff --git a/src/plugins/raster_terrain_analysis/CMakeLists.txt b/src/plugins/raster_terrain_analysis/CMakeLists.txt
@@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES(
      ../../core 
      ../../core/raster 
      ../../gui
+     ../../analysis/raster
      ..
      .
 )

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`usr/lib/libqgis_core.so...*`
`2`	`2`	`usr/lib/libqgis_gui.so...*`
	`3`	`+usr/lib/libqgis_analysis.so...*`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES(`
`37`	`37`	`../../core`
`38`	`38`	`../../core/raster`
`39`	`39`	`../../gui`
	`40`	`+ ../../analysis/raster`
`40`	`41`	`..`
`41`	`42`	`.`
`42`	`43`	`)`