merge from trunk r11450:11500

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11889 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

CMakeLists.txt

@@ -1,12 +1,12 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "3")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-SET(RELEASE_NAME "Daphnis")
+SET(RELEASE_NAME "Unstable")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
 # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
-SET(QGIS_VERSION_INT 10200)
+SET(QGIS_VERSION_INT 10300)
 
 # TODO:
 # - install includes for libs
@@ -340,20 +340,33 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
 
 FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
 
-IF (NOT SVN_MARKER)
-  SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt)  # Dummy file
-ENDIF (NOT SVN_MARKER)
-  # Add a custom command to drive the svn script whenever the svn entries
-  # file changes.
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/svnscript.cmake.in_cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake
-                @ONLY)
-
-  ADD_CUSTOM_COMMAND (
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-    DEPENDS ${SVN_MARKER}
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake
-)
+IF (SVN_MARKER)
+  # See if we have svn installed
+  FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)
+
+  IF(SVNVERSION)
+    IF(MSVC)
+	ADD_CUSTOM_COMMAND(
+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+		COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+		MAIN_DEPENDENCY ${SVN_MARKER}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	)
+    ELSE(MSVC)
+	ADD_CUSTOM_COMMAND(
+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+		COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+		MAIN_DEPENDENCY ${SVN_MARKER}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	)
+    ENDIF(MSVC)
+  ELSE(SVNVERSION)
+    MESSAGE(STATUS "svnversion not found - version will be unknown")
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
+  ENDIF (SVNVERSION)
+ELSE (SVN_MARKER)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
+ENDIF (SVN_MARKER)
 
 ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)
 

CONTRIBUTORS

@@ -34,3 +34,4 @@ Nikos Alexandris
 Robert Szczepanek
 Matt Amos
 Mathias Walker
+Germán Carrillo

TRANSLATORS

@@ -10,7 +10,7 @@
 #
 # ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
 #
-Arabic|Assem Kamal 
+Arabic|Assem Kamal, Latif Jalil
 Czech|Martin Landa
 Chinese|Zhang Jun
 Danish|Henriette Roued
@@ -22,9 +22,9 @@ Indonesian|Januar V. Simarmata
 Italian|Maurizio Napolitano
 Japanese|BABA Yoshihiko
 Lao|Anousak Souphavanh
-Latvian|Maris Nartiss
+Latvian|Maris Nartiss, Peteris Bruns
 Lithuanian|Kestas M
-Polish|Tomasz Paul, Mateusz Loskot, Robert Szczepanek
+Polish|Tomasz Paul, Mateusz Loskot, Milena Nowotarska, Robert Szczepanek
 Portuguese (Brazil)|Arthur Nanni, Christian Ferreira
 Romanian|Lonut Losifescu-Enescu
 Russian|Artem Popov

cmake_templates/qgssvnversion.h.in_cmake

@@ -1,3 +1,9 @@
+qgis (1.3.0) UNRELEASED; urgency=low
+
+  * new development version after 1.2 branch
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 22 Aug 2009 17:28:29 +0200
+
 qgis (1.2.0) UNRELEASED; urgency=low
 
   * new development version after 1.1 branch

cmake_templates/svnscript.cmake.in_cmake

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis1.2.0-dev, qgis-dev
+Build-Conflicts: libqgis1.3.0-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -39,7 +39,7 @@ Description: Quantum GIS - architecture-independent data
  This package contains architecture-independent supporting data files for use 
  with Quantum GIS.
 
-Package: libqgis1.2.0
+Package: libqgis1.3.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -50,10 +50,10 @@ Description: Quantum GIS - shared libraries
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis1.2.0-dev
+Package: libqgis1.3.0-dev
 Architecture: any
 Section: libdevel
-Depends: libqgis1.2.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
+Depends: libqgis1.3.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
  libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
  libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),