Merge branch 'master' of github.com:qgis/QGIS

qgis · Jun 2, 2016 · edace8d · edace8d
2 parents 3351f55 + 94077b2
commit edace8d
Show file tree

Hide file tree

Showing 124 changed files with 7,866 additions and 366 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -200,6 +200,7 @@ FIND_PACKAGE(GDAL)
 FIND_PACKAGE(Expat REQUIRED)
 FIND_PACKAGE(Spatialindex REQUIRED)
 FIND_PACKAGE(Qwt REQUIRED)
+FIND_PACKAGE(QJSON)
 
 IF (WITH_INTERNAL_QEXTSERIALPORT)
   SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)

diff --git a/debian/changelog b/debian/changelog
@@ -6,6 +6,7 @@ qgis (2.15.0) UNRELEASED; urgency=medium
   * refine GSL build dependency
   * limit python-future to stretch, sid, wily and xenial
   * include qgis.qch in qgis-api-doc
+  * include argis rest provider
 
   [ Matthias Kuhn ]
   * Add dependency to python-future
@@ -14,7 +15,7 @@ qgis (2.15.0) UNRELEASED; urgency=medium
   * Fix removal of obsolete diversions for bother the grass plugin & provider.
     (closes: #817176)
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 24 Mar 2016 09:53:20 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 02 Jun 2016 16:08:54 +0200
 
 qgis (2.14.0) unstable; urgency=medium
 

diff --git a/debian/control.in b/debian/control.in
@@ -31,6 +31,7 @@ Build-Depends:
 #wheezy jessie precise trusty utopic vivid wily# libqtwebkit-dev,
 #stretch jessie wheezy# libqwt-dev,
 #precise trusty wily xenial sid# libqwt5-qt4-dev,
+#sid stretch jessie wheezy trusty wily xenial# libqjson-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,

diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in
@@ -17,4 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
 usr/lib/qgis/plugins/libwcsprovider.so
 usr/lib/qgis/plugins/libwfsprovider.so
 usr/lib/qgis/plugins/libwmsprovider.so
+#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgismapserverprovider.so
+#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
 {QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so
diff --git a/debian/rules b/debian/rules
@@ -121,9 +121,11 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
-	CMAKE_OPTS += \
-		-DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so \
-		-DWITH_QTWEBKIT=FALSE
+	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
+endif
+
+ifneq (,$(findstring $(DISTRIBUTION),"sid stretch xenial"))
+	CMAKE_OPTS += -DWITH_QTWEBKIT=FALSE
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"sid"))

diff --git a/images/images.qrc b/images/images.qrc
@@ -589,6 +589,10 @@
         <file>themes/default/styleicons/paletted.svg</file>
         <file>themes/default/styleicons/singlebandgray.svg</file>
         <file>themes/default/styleicons/singlebandpseudocolor.svg</file>
+        <file>themes/default/mIconAfs.svg</file>
+        <file>themes/default/mIconAms.svg</file>
+        <file>themes/default/mActionAddAmsLayer.svg</file>
+        <file>themes/default/mActionAddAfsLayer.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>