Merge branch 'master' into dbl

Conflicts: images/splash/splash.png src/CMakeLists.txt src/app/main.cpp src/app/qgsvectorlayerproperties.cpp src/core/qgsvectorlayer.cpp src/providers/wms/qgswmssourceselect.cpp
qgis · May 13, 2011 · b206196 · b206196
2 parents 153ad16 + 3ec8059
commit b206196
Show file tree

Hide file tree

Showing 329 changed files with 10,168 additions and 10,712 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,11 @@ ms-windows/osgeo4w/nsis/
 ms-windows/osgeo4w/untgz/
 scripts/astyle
 qtcreator-build/
+ms-windows/nsis/
+ms-windows/osgeo4w/addons/
+ms-windows/packages/
+ms-windows/progs/
+ms-windows/untgz/
+scripts/astyle.exe
+# vim temporary files
+.*.swp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "7")
+SET(CPACK_PACKAGE_VERSION_MINOR "8")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-SET(RELEASE_NAME "Wroclaw")
+SET(RELEASE_NAME "Trunk")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
 IF (APPLE)
@@ -60,6 +60,9 @@ SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should b
 # include doxygen documentation
 SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
 
+# build our version of astyle
+SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
+
 # try to configure and build POSTGRESQL support
 SET (WITH_POSTGRESQL TRUE CACHE BOOL "Determines whether POSTGRESQL support should be built")
 IF (WITH_POSTGRESQL)
@@ -439,55 +442,37 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
 
 #############################################################
-# create qgssvnversion.h
+# create qgsversion.h
 
-FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)
 FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
 
-IF (SVN_MARKER)
-  # See if we have svn installed
-  FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)
-
-  IF(SVNVERSION)
+IF (GIT_MARKER)
+  FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
+  IF(GIT)
     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}
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
+        COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GIT}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
+        MAIN_DEPENDENCY ${GIT_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)
-  IF (GIT_MARKER)
-    FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
-    IF(GIT)
-      ADD_CUSTOM_COMMAND(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
-        COMMAND echo \\\#define QGSSVNVERSION \\\"$$\( ${GIT} log -n1 --grep='git-svn-id' | sed -ne 's/^  *git-svn-id:.*@\\\([0-9]*\\\).*$$/\\1/p' \)$$\( ${GIT} log --oneline $$\( ${GIT} log -n1 --grep='git-svn-id' --pretty=%H \).. | wc -l | sed -e 's/^/+/' -e 's/+0$$//' \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
+        COMMAND echo \\\#define QGSVERSION \\\"$$\( ${GIT} log -n1 --pretty=%h \)\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
         MAIN_DEPENDENCY ${GIT_MARKER}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )
-    ELSE(GIT)
-      MESSAGE(STATUS "git marker, but no git found - version will be unknown")
-      FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
-    ENDIF(GIT)
-  ELSE (GIT_MARKER)
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
-  ENDIF (GIT_MARKER)
-ENDIF (SVN_MARKER)
-
-ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)
+    ENDIF(MSVC)
+  ELSE(GIT)
+    MESSAGE(STATUS "git marker, but no git found - version will be unknown")
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"unknown\"")
+  ENDIF(GIT)
+ELSE (GIT_MARKER)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"exported\"")
+ENDIF (GIT_MARKER)
+
+ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
 
 #############################################################
 # process subdirs

diff --git a/INSTALL b/INSTALL
@@ -2,8 +2,8 @@ Quantum GIS (QGIS)
 Building QGIS from source - step by step
 
 
-Last update: 20110404
-Last change: 20110404
+Last update: 20110504
+Last change: 20110502
 
 
   1. Introduction
@@ -140,7 +140,7 @@ The packages qgis depends on to build are available in the "universe" component
 of Ubuntu. This is not activated by default, so you need to activate it:
 
 1. Edit your /etc/apt/sources.list file.  
-2. Uncomment the all the lines starting with "deb"
+2. Uncomment all the lines starting with "deb"
 
 Also you will need to be running (K)Ubuntu 'edgy' or higher in order for 
 all dependencies to be met.
@@ -150,6 +150,7 @@ Now update your local sources database:
   sudo apt-get update 
 
 
+
   3.3. Install build dependencies
   ===============================
 
@@ -166,9 +167,9 @@ Now update your local sources database:
 /!\ A Special Note: If you are following this set of instructions on
 a system where you already have Qt3 development tools installed, there will
 be a conflict between Qt3 tools and Qt4 tools. For example, qmake will
-point to the Qt3 version not the Qt4. Ubuntu Qt4 and Qt3 packages are
-designed to live alongside each other. This means that for example if you
-have them both installed you will have three qmake exe's:
+point to the Qt3 version, not the Qt4. Ubuntu Qt4 and Qt3 packages are
+designed to live alongside each other. This means that, for example, if you
+have them both installed, you will have three qmake exe's:
 
   /usr/bin/qmake -> /etc/alternatives/qmake 
   /usr/bin/qmake-qt3
@@ -227,7 +228,7 @@ This directory path will be assumed for all instructions that follow.
   ===================================
 
 There are two ways the source can be checked out. Use the anonymous method
-if you do not have edit privaleges for the QGIS source repository, or use
+if you do not have edit privileges for the QGIS source repository, or use
   the developer checkout if you have permissions to commit source code
   changes.
 
@@ -654,6 +655,9 @@ created.
 Adjust the path to bison and flex so that the shortened C:/Progra~1 is used 
 rather than C:/Program Files.
 
+Verify that the 'BINDINGS_GLOBAL_INSTALL' option is not checked, so that python
+bindings are placed into the output directory when you run the INSTALL target.
+
 Hit Configure to start the configuration and select Visual Studio 9 2008
 and keep native compilers and click Finish.
 
@@ -709,6 +713,9 @@ script.
   cd ms-windows/
   rm -rf osgeo4w/unpacked/apps/qgis/*
   cp -r /tmp/qgis1.7.0/* osgeo4w/unpacked/apps/qgis/
+
+Now create a package.
+
   ./quickpackage.sh
 
 After this you should now have a nsis installer containing your own build 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (1.8.0) UNRELEASED; urgency=low
+
+  * new development version 1.8 after branch
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 07 May 2011 00:47:20 +0200
+
 qgis (1.7.0) UNRELEASED; urgency=low
 
   * new development version 1.7 after branch

diff --git a/debian/control b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  python-dev,
  python-qt4-dev (>=4.1.0),
  python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
- subversion,
+ git-core | git,
  txt2tags,
  doxygen
 Build-Conflicts: libqgis-dev, qgis-dev
@@ -56,7 +56,7 @@ Description: Quantum GIS - architecture-independent data
  This package contains architecture-independent supporting data files for use 
  with Quantum GIS.
 
-Package: libqgis1.7.0
+Package: libqgis1.8.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -78,7 +78,7 @@ Depends:
  libgsl0-dev,
  libpq-dev,
  libproj-dev,
- libqgis1.7.0 (= ${binary:Version}),
+ libqgis1.8.0 (= ${binary:Version}),
  libqt4-dev (>=4.4.0),
  libsqlite3-dev,
  python-qt4 (>=4.1.0),

diff --git a/debian/control.hardy b/debian/control.hardy
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, fcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, git-core
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git-core, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git-core, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.karmic b/debian/control.karmic
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git-core, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.lenny b/debian/control.lenny
@@ -27,7 +27,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0),
  sip4 (>= 4.5),
- subversion,
+ git-core,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git-core,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/debian/control.natty b/debian/control.natty
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.sid b/debian/control.sid
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/debian/qgis-providers.install b/debian/qgis-providers.install
@@ -8,3 +8,4 @@ usr/lib/qgis/plugins/libmemoryprovider.so
 usr/lib/qgis/plugins/libspatialiteprovider.so
 usr/lib/qgis/plugins/libosmprovider.so 
 usr/lib/qgis/plugins/libgdalprovider.so 
+usr/lib/qgis/crssync
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -39,6 +39,7 @@ Markus Neteler
 Mathias Walker
 Matt Amos
 Maurizio Napolitano
+Mayeul Kauffmann
 Milena Nowotarska
 Nathan Woodrow
 Nikos Alexandris

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -18,7 +18,7 @@ Croatian|Zoran Jankovic
 Czech|Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
 Danish|Henriette Roued
 Dutch|Richard Duivenvoorde, Raymond Nijssen
-French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M
+French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann
 Georgian|Shota Murtskhvaladze, George Machitidze
 German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
 Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
@@ -38,7 +38,7 @@ Romanian|Lonut Losifescu-Enescu
 Russian|Artem Popov
 Slovak|Lubos Balazovic
 Slovenian|Jože Detečnik, Dejan Gregor
-Spanish|Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado
+Spanish|Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann
 Swedish|Lars Luthman, Magnus Homann
 Thai|Man Chao
 Turkish|Osman Yilmaz

diff --git a/doc/linux.t2t b/doc/linux.t2t
@@ -28,8 +28,8 @@ easiest option to compile and install QGIS.
 The packages qgis depends on to build are available in the "universe" component
 of Ubuntu. This is not activated by default, so you need to activate it:
 
-1. Edit your /etc/apt/sources.list file.  
-2. Uncomment the all the lines starting with "deb"
++ Edit your /etc/apt/sources.list file.  
++ Uncomment all the lines starting with "deb"
 
 Also you will need to be running (K)Ubuntu 'edgy' or higher in order for 
 all dependencies to be met.
@@ -56,9 +56,9 @@ sudo apt-get update
 /!\ **A Special Note:** If you are following this set of instructions on
 a system where you already have Qt3 development tools installed, there will
 be a conflict between Qt3 tools and Qt4 tools. For example, qmake will
-point to the Qt3 version not the Qt4. Ubuntu Qt4 and Qt3 packages are
-designed to live alongside each other. This means that for example if you
-have them both installed you will have three qmake exe's:
+point to the Qt3 version, not the Qt4. Ubuntu Qt4 and Qt3 packages are
+designed to live alongside each other. This means that, for example, if you
+have them both installed, you will have three qmake exe's:
 
 ``` 
 /usr/bin/qmake -> /etc/alternatives/qmake 
@@ -121,7 +121,7 @@ This directory path will be assumed for all instructions that follow.
 == Check out the QGIS Source Code ==
 
 There are two ways the source can be checked out. Use the anonymous method
-if you do not have edit privaleges for the QGIS source repository, or use
+if you do not have edit privileges for the QGIS source repository, or use
   the developer checkout if you have permissions to commit source code
   changes.