Merge remote-tracking branch 'upstream/master' into expression-labels…

…-merge-wonder
qgis · Aug 31, 2011 · 27d3e51
2 parents 706b6f1 + 7deb0c9
commit 27d3e51
Show file tree

Hide file tree

Showing 222 changed files with 13,926 additions and 4,537 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,8 +18,8 @@ MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS
 #############################################################
 # CMake settings
 
-# 2.6 required for QtWebkit
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# 2.6.2 required for VERSION_LESS
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 

diff --git a/INSTALL b/INSTALL
@@ -1,9 +1,9 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Thursday August 04, 2011
+Sunday August 07, 2011
 
 
-Last Updated: Thursday August 04, 2011
+Last Updated: Sunday August 07, 2011
 Last Change : Tuesday June 28, 2011
 
 
@@ -263,8 +263,8 @@ Now we create a build directory and run ccmake:
 When you run ccmake (note the .. is required!), a menu will appear where 
 you can configure various aspects of the build. If you do not have root
 access or do not want to overwrite existing QGIS installs (by your
-packagemanager for example), set the CMAKE_BUILD_PREFIX to somewhere you
-have write access to (I usually use /home/timlinux/apps). Now press
+packagemanager for example), set the CMAKE_INSTALL_PREFIX to somewhere you
+have write access to (I usually use ${HOME}/apps). Now press
 'c' to configure, 'e' to dismiss any error messages that may appear.
 and 'g' to generate the make files. Note that sometimes 'c' needs to 
 be pressed several times before the 'g' option becomes available.

diff --git a/cmake/Bison.cmake b/cmake/Bison.cmake
@@ -27,11 +27,11 @@ MACRO(FIND_BISON)
       # get first line in case it's multiline
       STRING(REGEX REPLACE "([^\n]+).*" "\\1" FIRST_LINE "${BISON_VERSION_STR}")
       # get version information
-      STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
-      STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
-      IF (BISON_VERSION_MAJOR LESS 2)
-        MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.0 or higher.")
-      ENDIF (BISON_VERSION_MAJOR LESS 2)
+      STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)(\\..*)?" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
+      STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)(\\..*)?" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
+      IF (BISON_VERSION_MAJOR LESS 2 OR (BISON_VERSION_MAJOR EQUAL 2 AND BISON_VERSION_MINOR LESS 4))
+        MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.4 or higher.")
+      ENDIF (BISON_VERSION_MAJOR LESS 2 OR (BISON_VERSION_MAJOR EQUAL 2 AND BISON_VERSION_MINOR LESS 4))
 
     ENDIF (NOT BISON_EXECUTABLE)
   ENDIF(NOT BISON_EXECUTABLE)

diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -96,18 +96,23 @@ ELSE(WIN32)
       PATHS
         /usr/include/qgis
         /usr/local/include/qgis
+        /Library/Frameworks/qgis_core.framework/Headers
         ${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
         "$ENV{LIB_DIR}/include/qgis"
     )
     # also get other frameworks' headers folders on OS X
     IF (APPLE)
       FIND_PATH(QGIS_GUI_INCLUDE_DIR
         NAMES qgisgui.h
-        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
+        PATHS
+          /Library/Frameworks/qgis_core.framework/Headers
+          ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
       )
       FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
         NAMES qgsinterpolator.h
-        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
+        PATHS
+          /Library/Frameworks/qgis_analysis.framework/Headers
+          ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
       )
       SET(QGIS_INCLUDE_DIR
         ${QGIS_INCLUDE_DIR}
@@ -121,6 +126,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )
@@ -130,6 +136,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )
@@ -139,6 +146,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )

diff --git a/cmake/FindQwt.cmake b/cmake/FindQwt.cmake
@@ -32,8 +32,10 @@ IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
 ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
 
 IF (QWT_FOUND)
+  FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header)
+  STRING(REGEX REPLACE "^.*QWT_VERSION_STR +\"([^\"]+)\".*$" "\\1" QWT_VERSION_STR "${qwt_header}")
   IF (NOT QWT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY}")
+    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION_STR})")
   ENDIF (NOT QWT_FIND_QUIETLY)
 ELSE (QWT_FOUND)
   IF (QWT_FIND_REQUIRED)

diff --git a/cmake/PythonMacros.cmake b/cmake/PythonMacros.cmake
@@ -7,7 +7,7 @@
 #
 # This file defines the following macros:
 #
-# PYTHON_INSTALL (SOURCE_FILE DESINATION_DIR)
+# PYTHON_INSTALL (SOURCE_FILE DESTINATION_DIR)
 #     Install the SOURCE_FILE, which is a Python .py file, into the
 #     destination directory during install. The file will be byte compiled
 #     and both the .py file and .pyc file will be installed.

diff --git a/debian/changelog b/debian/changelog
@@ -2,8 +2,11 @@ qgis (1.8.0) UNRELEASED; urgency=low
 
   * new development version 1.8 after branch
   * add qgis browser (qbrowser)
+  * add zonal statistics plugins and globe plugin
+  * migrate unstable package to dh_python2
+  * add ubuntu oneiric
 
- -- Jürgen E. Fischer <jef@norbit.de>  Mon, 23 May 2011 18:08:18 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Tue, 23 Aug 2011 22:25:08 +0200
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

diff --git a/debian/compat.oneiric b/debian/compat.oneiric
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  libgsl0-dev,
  libpq-dev,
  libqt4-dev (>=4.4.0),
- libqwt5-qt4-dev,
+ libqwt5-qt4-dev | libqwt-dev,
  libsqlite3-dev,
  proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
  pyqt4-dev-tools,

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -31,7 +31,7 @@ Build-Depends:
  git-core,
  doxygen,
  graphviz,
- txt2tags 
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.oneiric b/debian/control.oneiric
@@ -0,0 +1,197 @@
+Source: qgis
+Section: science
+Priority: extra
+Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
+Build-Depends:
+ bison,
+ cmake (>= 2.6),
+ debhelper (>= 7),
+ flex,
+ grass-dev,
+ libexpat1-dev,