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

qgis · Feb 5, 2012 · 1be0e87 · 1be0e87
2 parents 876b8c7 + c933dce
commit 1be0e87
Show file tree

Hide file tree

Showing 672 changed files with 488,055 additions and 266,709 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ doc/CODING.tex
 doc/INSTALL.tex
 scripts/Debug
 scripts/RelWithDebInfo
+/CMakeLists.txt.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,8 @@ IF (WITH_GRASS)
   SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
 ENDIF (WITH_GRASS)
 
+SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
+
 # mapserver by us disabled default because it needs FastCGI (which is optional dependency)
 SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
 
@@ -117,7 +119,7 @@ ENDIF (NOT BISON_EXECUTABLE)
 #############################################################
 # search for dependencies
 
-IF(NOT WIN32)
+IF(NOT WIN32 AND NOT ANDROID)
   INCLUDE(CheckFunctionExists)
   CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)
   IF(NOT OPENPTY_IN_LIBC)
@@ -130,14 +132,13 @@ IF(NOT WIN32)
       MESSAGE (SEND_ERROR "openpty not found!")
     ENDIF(NEED_LIBUTIL)
   ENDIF(NOT OPENPTY_IN_LIBC)
-ENDIF(NOT WIN32)
+ENDIF(NOT WIN32 AND NOT ANDROID)
 
 # required
 FIND_PACKAGE(Proj)
-FIND_PACKAGE(Expat)    # GPS importer plugin
-FIND_PACKAGE(GSL)      # Georeferencer
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(GDAL)
+FIND_PACKAGE(Expat)
 
 IF (NOT WITH_INTERNAL_SPATIALINDEX)
   FIND_PACKAGE(Spatialindex REQUIRED)
@@ -186,11 +187,18 @@ SET(QT_USE_QTXML 1)
 SET(QT_USE_QTNETWORK 1)
 SET(QT_USE_QTSVG 1)
 SET(QT_USE_QTSQL 1)
-SET(QT_USE_QTWEBKIT 1)
 
-IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
+IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
   MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
-ENDIF ()
+ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
+
+IF(WITH_DESKTOP)
+  SET(QT_USE_QTWEBKIT 1)
+
+  IF(NOT QT_QTWEBKIT_FOUND)
+    MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!")
+  ENDIF(NOT QT_QTWEBKIT_FOUND)
+ENDIF(WITH_DESKTOP)
 
 IF (ENABLE_TESTS)
   SET( QT_USE_QTTEST  TRUE )
@@ -339,6 +347,10 @@ ELSE (WIN32)
 
 ENDIF (WIN32)
 
+IF (ANDROID)
+    SET (DEFAULT_PLUGIN_SUBDIR  lib)
+    SET (DEFAULT_DATA_SUBDIR    files/share)
+ENDIF (ANDROID)
 
 #assume we have escaped compiler directives
 #eventually we want to change this to new

diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Sunday November 06, 2011
+Tuesday December 27, 2011
 
 
-Last Updated: Sunday November 06, 2011
-Last Change : Sunday November 06, 2011
+Last Updated: Tuesday December 27, 2011
+Last Change : Tuesday December 27, 2011
 
 
   1. Introduction
@@ -1226,7 +1226,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
 Once downloaded, open and install the frameworks.
 
 William provides an additional installer package for Postgresql (for PostGIS
-support).  Qgis just needs the libpq client library, so unless you want to
+support).  QGIS just needs the libpq client library, so unless you want to
 setup the full Postgres + PostGIS server, all you need is the client-only
 package.  It's available here:
 
@@ -1242,7 +1242,7 @@ http://www.kyngchaos.com/wiki/software/grass
 
 There are some additional dependencies that, at the time of writing, are not
 provided as frameworks or installers so we will need to build these from source.
-If you are wanting to build Qgis as a 64-bit application, you will need to 
+If you are wanting to build QGIS as a 64-bit application, you will need to 
 provide the appropriate build commands to produce 64-bit support in dependencies.
 Likewise, for 32-bit support on Snow Leopard, you will need to override the
 default system architecture, which is 64-bit, according to instructions for
@@ -1404,7 +1404,7 @@ http://pyqwt.sourceforge.net/
 
 Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0
 (comes with Qwt 5.2.1).  Normal compilation does both Qwt and PyQwt at the same
-time, but Qwt is statically linked into PyQwt, and Qgis can't use it.  So, we
+time, but Qwt is statically linked into PyQwt, and QGIS can't use it.  So, we
 need to split the build.
 
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build
@@ -1522,7 +1522,7 @@ This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.
 
 Or, to use a Unix-style build of GRASS, use the following cmake invocation
-(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
+(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
 path and version as required):
 
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
@@ -1553,7 +1553,7 @@ script and add arch flags to the configuration:
   -D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
   ..
 
-The Qgis Mapserver feature requires fastcgi support.  This is included in
+The QGIS Mapserver feature requires fastcgi support.  This is included in
 Leopard and Snow Leopard, but was dropped at Lion.  To build the Mapserver
 component on Leopard and Snow, add the followling line before the last line in
 the above configuration:
@@ -1564,9 +1564,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
 support to the system Apache.  Not recommended for the average user.
 
 Bundling note: Older Qt versions may have problems with some Qt plugins and
-Qgis.  The way to handle this is to bundle Qt inside the Qgis application.  You
-can do this now or wait to see if there are immediate crashes when running Qgis.
-It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
+QGIS.  The way to handle this is to bundle Qt inside the QGIS application.  You
+can do this now or wait to see if there are immediate crashes when running QGIS.
+It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
 you would have to install Xcode just so Qt would install!).
 
 To bundle Qt, add the following line before the last line (the ".." line) in

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
@@ -14,7 +14,12 @@
 #    POSTGRES_INCLUDE_DIR
 #    POSTGRES_LIBRARY
 
-IF(WIN32)
+IF(ANDROID)
+  SET(POSTGRES_INCLUDE_DIR ${POSTGRES_INCLUDE_DIR} CACHE STRING INTERNAL)
+  SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
+ENDIF(ANDROID)
+
+IF(WIN32 AND NOT ANDROID)
   IF (NOT POSTGRES_INCLUDE_DIR)
     FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h 
       /usr/local/include 
@@ -65,7 +70,8 @@ ELSE(WIN32)
     ENDIF(POSTGRES_CONFIG)
 
   ENDIF(UNIX)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT ANDROID)
+
 
 IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
    SET(POSTGRES_FOUND TRUE)

diff --git a/cmake/MacBundleMacros.cmake b/cmake/MacBundleMacros.cmake
@@ -31,20 +31,26 @@ ENDFUNCTION (MYMESSAGE)
 # regex stuff taken from GetPrerequisites
 
 FUNCTION (GET_INSTALL_NAME LIBFILE LIBNAME OUTVAR)
-    EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
-    # remove 1st line, it's just path to lib file
-    STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
-    IF (iname)
-        # find libname
-        STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
-    ENDIF (iname)
-    SET (${OUTVAR} ${iname} PARENT_SCOPE)
+    IF (EXISTS "${LIBFILE}")
+        EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
+        # remove 1st line, it's just path to lib file
+        STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
+        IF (iname)
+            # find libname
+            STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
+        ENDIF (iname)
+        SET (${OUTVAR} ${iname} PARENT_SCOPE)
+    ELSE ()
+        SET (${OUTVAR} "" PARENT_SCOPE)
+    ENDIF ()
 ENDFUNCTION (GET_INSTALL_NAME)
 
 # install_name_tool -change CHANGE CHANGETO CHANGEBIN
 
 FUNCTION (INSTALLNAMETOOL_CHANGE CHANGE CHANGETO CHANGEBIN)
-    EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
+    IF (EXISTS "${CHANGEBIN}" AND CHANGE AND CHANGETO)
+        EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
+    ENDIF ()
 ENDFUNCTION (INSTALLNAMETOOL_CHANGE)
 
 # copy a framework, only specified archs, current version, debug dep on CMAKE_BUILD_TYPE
@@ -59,22 +65,24 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
         OUTPUT_VARIABLE FWDIRPHYS
     )
     STRING (STRIP "${FWDIRPHYS}" FWDIRPHYS)
-    STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
-    EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
-    EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
-    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
-    EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
-    IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
-        EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
-        EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
-    ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
-    # debug variants
-    SET (FWD "${FWNAME}_debug")
-    IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
-        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
-        EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
-        IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
-            EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
+    IF (IS_DIRECTORY "${FWDIRPHYS}")
+        STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
+        EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
+        EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
+        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
+        EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
+        IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
+            EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
+            EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
+        ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
+        # debug variants
+        SET (FWD "${FWNAME}_debug")
+        IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
+            EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
+            EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
+            IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
+                EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
+            ENDIF ()
         ENDIF ()
     ENDIF ()
 ENDFUNCTION (COPY_FRAMEWORK)
@@ -95,16 +103,17 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
         ENDIF ()
         SET (LIB_CHG_TO "${ATEXECUTABLE}/${LIBMID}/${LIBPOST}")
         # app - always @executable_path
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR}/${QGIS_APP_NAME}")
-        # qgis_help, qbrowser - doesn't link anything else than Qt/Qgis
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qgis_help.app/Contents/MacOS/qgis_help")
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qbrowser.app/Contents/MacOS/qbrowser")
+        INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QAPPDIR}/${QGIS_APP_NAME}")
+        # qgis helper apps - don't link anything else than Qt/Qgis
+        FOREACH (QA ${QGAPPLIST})
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${QA}.app/Contents/MacOS/${QA}")
+        ENDFOREACH (QA)
         # qgis-mapserver
         IF (${WITH_MAPSERVER})
             IF (${OSX_HAVE_LOADERPATH})
                 SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_CGIBIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
             ENDIF ()
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QCGIDIR}/qgis_mapserv.fcgi")
         ENDIF ()
         # libs
         IF (${OSX_HAVE_LOADERPATH})
@@ -116,40 +125,40 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
             ENDIF ()
         ENDIF ()
         FOREACH (QL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QFWDIR}/${QL}.framework/${QL}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QFWDIR}/${QL}.framework/${QL}")
         ENDFOREACH (QL)
         # libqgispython is not a framework
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBDIR}/libqgispython.dylib")
+        INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/libqgispython.dylib")
         # GRASS libexec stuff
         IF (EXISTS "${QLIBXDIR}/grass/bin/qgis.g.browser")
            IF (${OSX_HAVE_LOADERPATH})
                SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
            ENDIF ()
-           INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBXDIR}/grass/bin/qgis.g.browser")
+           INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/grass/bin/qgis.g.browser")
         ENDIF ()
         # plugins
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/${QGIS_PLUGIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
         FOREACH (QP ${QGPLUGLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QP}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QP}")
         ENDFOREACH (QP)
         # qgis python
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_DATA_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
         FOREACH (PG ${QGPYLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${PG}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${PG}")
         ENDFOREACH (PG)
         # bin - nothing yet
         #IF (${OSX_HAVE_LOADERPATH})
         #    SET (LIB_CHG_TO "${ATLOADER}/${QGIS_BIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         #ENDIF ()
         #FOREACH (PB ...)
-        #    INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/${PB}")
+        #    INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${PB}")
         #ENDFOREACH (PB)
     ENDIF (LIBFROM)
 ENDFUNCTION (UPDATEQGISPATHS)
@@ -177,8 +186,10 @@ FOREACH (QARCH ${CMAKE_OSX_ARCHITECTURES})
 ENDFOREACH (QARCH)
 
 # common file lists
-FILE (GLOB QGFWLIST RELATIVE ${QFWDIR} ${QFWDIR}/qgis*.framework)
+FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
 # for some reason, REPLACE is stripping list seps
 STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
-FILE (GLOB QGPLUGLIST ${QPLUGDIR}/*.so)
-FILE (GLOB QGPYLIST ${QGISPYDIR}/qgis/*.so)
+FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
+FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
+FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")
+STRING(REPLACE ".app" ";" QGAPPLIST ${QGAPPLIST})
diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -94,15 +94,15 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
         ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
       ELSE(MSVC)
         # disable all warnings
-        ADD_DEFINITIONS( -w )
+        ADD_DEFINITIONS( -w -fpermissive )
       ENDIF(MSVC)
     ENDIF(PEDANTIC)
 
     ADD_CUSTOM_COMMAND(
         OUTPUT ${_sip_output_files} 
         COMMAND ${CMAKE_COMMAND} -E echo ${message}
         COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} 
-        COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
+        COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
         DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
     )
     # not sure if type MODULE could be uses anywhere, limit to cygwin for now

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -25,6 +25,7 @@
 #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
 #define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"
 #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
 
 #cmakedefine HAVE_POSTGRESQL
 

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

diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -13,5 +13,6 @@ usr/share/qgis/doc/images
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*
 usr/share/qgis/resources/context_help/*
+usr/share/qgis/resources/function_help/*
 usr/share/qgis/resources/spatialite.db
 usr/share/qgis/resources/qgis_help.db
diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -42,3 +42,4 @@ Werner Macho	<werner.macho at gmail.com>
 Giuseppe Sucameli	<brush.tyler at gmail.com>
 Alessandro Furieri	<a.furieri at lqt.it>
 Alexander Bruy	<alexander.bruy@gmail.com>
+Marco Bernasocchi	<marco at bernawebdesign dot ch>
diff --git a/doc/CODING.t2t b/doc/CODING.t2t
@@ -34,7 +34,7 @@ Developers guide for QGIS
 %! PostProc(tex): '\\section' '\\newpage\\section'
 %! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
 %! PostProc(tex): NEWPAGE  '\\newpage'
-% Give alternating table rows different colours and use a smaller font in tables (\tiny)
+% Give alternating table rows different colors and use a smaller font in tables (\tiny)
 %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
 %! encoding: iso-8859-1