Merge upstream/master; fix conflicts

qgis · Nov 17, 2011 · a0dad9c · a0dad9c
2 parents aabfdf9 + 0a17ad5
commit a0dad9c
Show file tree

Hide file tree

Showing 121 changed files with 85,597 additions and 4,915 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "8")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
+SET(CPACK_PACKAGE_VERSION_PATCH "90")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-SET(RELEASE_NAME "Trunk")
+SET(RELEASE_NAME "Alpha")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
 IF (APPLE)
@@ -88,7 +88,7 @@ ENDIF (WITH_GLOBE)
 SET (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.")
 
 # whether unit tests should be build
-SET (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?")
+SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
 
 # hide this variable because building of python bindings might fail
 # if set to other directory than expected
@@ -195,6 +195,8 @@ ENDIF ()
 IF (ENABLE_TESTS)
   SET( QT_USE_QTTEST  TRUE )
   ENABLE_TESTING()
+  # Define "make check" as alias for "make test" - thanks geos :-)
+  add_custom_target(check COMMAND ctest)
 ENDIF (ENABLE_TESTS)
 
 
@@ -500,6 +502,8 @@ IF (ENABLE_TESTS)
   #the test data. See CMakeLists in test dirs for more info
   SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
   ADD_SUBDIRECTORY(tests)
+  SET (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" )
+  MESSAGE (STATUS "Ctest Binary Directory  set to: ${CTEST_BINARY_DIRECTORY}")
 ENDIF (ENABLE_TESTS)
 
 IF (APPLE)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (1.9.90) UNRELEASED; urgency=low
+
+  * new development version 1.9.90 after branch of 1.8.0
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Wed, 16 Nov 2011 09:43:40 +0100
+
 qgis (1.8.0) UNRELEASED; urgency=low
 
   * new development version 1.8 after branch

diff --git a/debian/rules b/debian/rules
@@ -106,6 +106,11 @@ build-stamp: debian/build/CMakeCache.txt
 	# Add here commands to compile the package.
 	$(MAKE) -C debian/build
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	# Code to run the package test suite - and ignore the outcome for now
+	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
+endif
+
 	touch $@
 
 cleantemplates:

diff --git a/doc/SPONSORS b/doc/SPONSORS
@@ -16,6 +16,7 @@ Please consider sponsoring the development of QuantumGIS.
 See: http://qgis.org/en/sponsorship.html
 
 SILVER
+State of Vorarlberg, Austria (11.2011)|http://www.vorarlberg.at/
 Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/
 
 BRONZE

diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_gl_ES.ts b/i18n/qgis_gl_ES.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
@@ -1807,7 +1807,7 @@ http://trac.faunalia.it/GdalTools-plugin</source>
         <translation>GDAL Tools (noto anche come Raster Tools) è un plugin per QuantumGIS che facilita l&apos;utilizzo di GDAL, fornendo un&apos;interfaccia grafica semplificata per i programmi più utilizzati.
 
 Il plugin è sviluppato da Faunalia (http://faunalia.it) in collaborazione con GIS-lab (http://gis-lab.info).
-Icone realizzare da Robert Szczepanek.
+Icone realizzate da Robert Szczepanek.
 Si ringrazia Silvio Grosso per la sponsorizzazione.
 
 Aiutateci a testare il plugin, informandoci sui eventuali bug, migliorando il codice o supportandoci economicamente.
@@ -14793,7 +14793,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui" line="275"/>
         <source>Start import at row</source>
-        <translation>Inizia l&apos;importazione dalla colonna</translation>
+        <translation>Inizia l&apos;importazione dalla riga</translation>
     </message>
     <message>
         <location filename="../src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui" line="293"/>
@@ -22434,7 +22434,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve
     <message>
         <location filename="../src/app/qgsmaptoolsimplify.cpp" line="302"/>
         <source>This feature cannot be simplified. Check if feature has enough vertices to be simplified.</source>
-        <translation>Questa geometria non può essere semplificata. Verificare se la geometria ha abbastanza vertifici per la semplificazione.</translation>
+        <translation>Questa geometria non può essere semplificata. Verificare se la geometria ha abbastanza vertici per la semplificazione.</translation>
     </message>
 </context>
 <context>