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

CMakeLists.txt

@@ -304,13 +304,37 @@ IF (PEDANTIC)
     ADD_DEFINITIONS( /wd4610 )  # user defined constructor required (sqlite3_index_info)
     ADD_DEFINITIONS( /wd4706 )  # assignment within conditional expression (pal)
   ELSE (MSVC)
-    ADD_DEFINITIONS( -Wall -Wextra  -Wno-long-long -Wformat-security -Wno-strict-aliasing )
+    IF (APPLE)
+      # add warnings via flags instead of definitions on Mac (otherwise -Wall can not be overridden per language)
+      SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
+      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")
+    ELSE (APPLE)
+      ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
+    ENDIF (APPLE)
     # Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
     # There are redundant declarations in Qt and GDAL
     # ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
+
+    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      IF (APPLE)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
+      ELSE (APPLE)
+        ADD_DEFINITIONS(-Wno-return-type-c-linkage) # used in plugins and providers
+      ENDIF (APPLE)
+    ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   ENDIF (MSVC)
+
 ENDIF (PEDANTIC)
 
+IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Qunused-arguments")
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Qunused-arguments")
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Qunused-arguments")
+ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
   # spatialite crashes on ppc - see bugs.debian.org/603986
   ADD_DEFINITIONS( -fno-strict-aliasing )

debian/changelog

@@ -9,10 +9,11 @@ qgis (1.9.0) UNRELEASED; urgency=low
   * add python-unittest2 build dependency for maverick and squeeze
   * disable PyQgsRectangle test on lucid (depends on unittest2)
   * add python-psycopg2 and python-qscintilla2 dependency to python-qgis
-  * add support for ubuntu quantal
+  * add support for ubuntu quantal and raring
   * remove js files and add libjs-jquery/libjs-underscore dependency
+  * temporarily disable mssql provider until migrated to new vector api.
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 09 Nov 2012 10:53:48 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 31 Jan 2013 13:34:24 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

debian/compat.quantal

@@ -1 +1 @@
-7
+8

debian/compat.raring

@@ -0,0 +1 @@
+7

debian/control.quantal

@@ -5,28 +5,27 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends:
  bison,
  cmake (>= 2.6),
- debhelper (>= 7),
+ debhelper (>= 9),
  flex,
  grass-dev,
  libexpat1-dev,
  libfcgi-dev,
- libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
+ libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqt4-dev (>=4.4.0),
  libqt4-opengl-dev,
  libqtwebkit-dev,
- libqwt5-qt4-dev,
+ libqwt-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
  pkg-config,
  pyqt4-dev-tools,
  python,
- python-central (>=0.5),
- python-dev,
+ python-dev (>= 2.6.6-3~),
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
@@ -39,8 +38,8 @@ Build-Depends:
  txt2tags,
  xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.8.4
-XS-Python-Version: current
+Standards-Version: 3.9.3
+X-Python-Version: current
 Homepage: http://qgis.org/
 
 Package: qgis
@@ -60,11 +59,12 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
+Depends: ${misc:Depends}
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
  .
- This package contains architecture-independent supporting data files for use 
+ This package contains architecture-independent supporting data files for use
  with Quantum GIS.
 
 Package: libqgis{QGIS_ABI}
@@ -84,7 +84,7 @@ Section: libdevel
 Depends:
  grass-dev,
  libexpat1-dev,
- libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
+ libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
  libpq-dev,
@@ -94,7 +94,8 @@ Depends:
  libsqlite3-dev,
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0)
+ qt4-designer (>=4.4.0),
+ ${misc:Depends}
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
@@ -116,7 +117,7 @@ Description: GRASS plugin for Quantum GIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: ${python:Depends}
+Depends: python, ${misc:Depends}
 Replaces: qgis-common (<< 1.5)
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -129,9 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}