merge from trunk r11500:11550

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11891 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 2, 2009 · f289661 · f289661
1 parent d282d2a
commit f289661
Show file tree

Hide file tree

Showing 141 changed files with 82,301 additions and 44,154 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -282,16 +282,19 @@ IF (WIN32)
     ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
     ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
     ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
+    ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
   ELSE (MSVC)
     ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
     ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
     ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
+    ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   # other compilers don't use that MSVC construct
   ADD_DEFINITIONS(-DCORE_EXPORT=)
   ADD_DEFINITIONS(-DGUI_EXPORT=)
   ADD_DEFINITIONS(-DPYTHON_EXPORT=)
+  ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
 ENDIF (WIN32)
 
 #############################################################

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/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts