Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android

CMakeLists.txt

@@ -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)
 
 
@@ -504,6 +506,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)

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

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:

doc/SPONSORS

@@ -20,5 +20,6 @@ State of Vorarlberg, Austria (11.2011)|http://www.vorarlberg.at/
 Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/
 
 BRONZE
+City of Uster, Switzerland (11.2011)|http://gis.uster.ch/
 Studio Associato Gfosservices|http://www.gfosservices.com
 NEXTGIS|http://nextgis.org

doc/changelog.t2t

@@ -15,29 +15,77 @@ Change history for the QGIS Project
 % These are comments and will not be generated in any output
 % -------------------
 
-% This document is in txt2tags format. You can generate html, plain text and
-% moinmoin formatted documentation by running txt2tags on this document. See the
-% txt2tags home page for more details.  Please insert manual line breaks in this
-% document as it makes diffing for changes much easier. To do this in vim 
-% automatically, select a section then issue (gq) command. Please don't
-% apply vim formatting to the whole document as it screws up some formatting
-% rather apply it selectively to paragraphs where needed.
+%This document is in txt2tags format. You can generate html, plain text and
+%moinmoin formatted documentation by running txt2tags on this document. See the
+%txt2tags home page for more details.  Please insert manual line breaks in this
+%document as it makes diffing for changes much easier. To do this in vim 
+%automatically, select a section then issue (gq) command. Please don't
+%apply vim formatting to the whole document as it screws up some formatting
+%rather apply it selectively to paragraphs where needed.
 
 % To generate the text version of this document:
-% txt2tags -t txt -o CHANGELOG CHANGELOG.t2t
+% txt2tags -t txt -o ../CHANGELOG changelog.t2t
 % To generate the mediawiki version of this document:
-% txt2tags -t wiki --no-enum-title -o CHANGELOG.wiki CHANGELOG.t2t
+% txt2tags -t wiki --no-enum-title -o CHANGELOG.wiki changelog.t2t
 % To generate the html version of this document:
-% txt2tags -t html -o CHANGELOG.html CHANGELOG.t2t
+% txt2tags -t html -o changelog.html changelog.t2t
 % To generate the LaTeX version of this document:
-% txt2tags -t tex -o CHANGELOG.tex CHANGELOG.t2t; pdflatex CHANGELOG.tex
+% txt2tags -t tex -o CHANGELOG.tex CHANGELOG.t2t; pdflatex changelog.tex
 
 % End of comments
 % -------------------
 
 Last Updated: %%date(%A %B %d, %Y)
 Last Change : %%mtime(%A %B %d, %Y)
 
+= Whats new in Version 1.7.2 'Wroclaw'? =
+
+This is a bugfix release over version 1.7.1. The following changes
+were made.
+
+- Fix Gdaltools error checking for ogr layers
+- More Translations in OSM plugin
+- Fix for ticket #4283 (composer forgets on/off status of layers)
+- Fix to v.generalize for recent GRASS versions
+- Fix typos in GRASS command list
+- Restore override cursor when about box is shown
+- Fix #4319 (Enhance maximum for point displacement tolerance)
+- Added Python wrappers for QgsZonalStatistics
+- Fix #4331 (Classification dialog issues)
+- Fix #4282 (Wrong map zooming when using the "Attribute Table" zoom tool)
+- Match proj4string in database
+- Fix #4241 (Ensure that we have a valid line in line decoration)
+- Fix label id for GetPrint in composer
+- Fix #3041 (Make the gdaltools command editable)
+- Fix shift in point displacement renderer
+- Fix for a crash in projection selection
+- Fix #4308 (Interpolation and Terrain core plugins)
+- Insert date value in attribute editor
+- Fix #4387 (Enable "add direction symbol" only for line layers)
+- Fix #2491 (Handle raster layer's transparency band while rendering)
+- Allow setting I/O encoding for OGR layers in vector layer properties.
+- Fix #4414 (SVG indicators for arrows are not shown)
+- Label direction symbol shouldn't depend on "map" vs. "line" orientation.
+- Set prompt as default behaviour for unknown CRS
+- For EPSG initialize GDAL CRS from authid instead of proj.4 string
+- Fix #4439 (Crash when changing style in Layer Properties)
+- Fix #4444 (Error when loading Python plugins)
+- Fix #4440 (invalid reference to Trac)
+- Fix stopRender call in graduated symbol renderer
+- Fix #4479 - trigger "new color ramp" always when activated
+- Hide query entry in legend context menu for layers with joins
+- Fix #4496 (Refresh map list in composer table widget in showEvent)
+- OS X build/install updates
+- GRASS version support
+- Intializing from WKT favourize EPSG instead of PROJ.4
+- Add What's this to Help menu (implement #4179)
+- fTools: update layers lists after adding new layer to TOC (fix #4318)
+- Don't block QGIS main window when running Merge shapefiles tool. Partially addresses #4383
+- Fix broken Assign projection functionality in GDALTools and improve handling output file extension
+- 
+
+
+
 = Whats new in Version 1.7.1 'Wroclaw'? =
 
 This is a bugfix release over version 1.7.0. The following changes 
@@ -81,7 +129,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Reduce top and side margins for attribute table dialog
 - Remove the (hopefully) last SVN reference
 - More svn version removal
-- Added missing color accessor/mutator/member from composerlegenditem header
+- Added missing colour accessor/mutator/member from composerlegenditem header
 - Get rid of svn version stuff from release branch.
 - Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
 - Try to make the histogram smoother
@@ -216,7 +264,7 @@ changed so we will just provide a bullet list of key new features here.
 
 - Support for icons of plugins in the plugin manager dialog.
 - Removed quickprint plugin - use easyprint plugin rather from plugin repo.
-- Removed ogr converter plugin - use 'save as' context menu rather.
+- Removed ogr convertor plugin - use 'save as' context menu rather.
 - 
 
 ==Printing==