[qgis] 01/01: Imported Upstream version 2.12.3+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Jan 20 05:43:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch upstream
in repository qgis.
commit c8f1ca1e9e96aa34e6d45aaa4843eb2ca44d73d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 20 06:39:33 2016 +0100
Imported Upstream version 2.12.3+dfsg
---
CMakeLists.txt | 2 +-
ChangeLog | 41 ++++++++++++++++++++++
debian/changelog | 10 ++++--
debian/control.in | 1 +
ms-windows/osgeo4w/package.cmd | 16 ++++-----
.../db_manager/db_plugins/oracle/data_model.py | 3 ++
.../plugins/db_manager/db_plugins/oracle/plugin.py | 2 +-
src/core/qgsmaplayer.cpp | 6 ++++
8 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5610400..48137d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "12")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Lyon")
IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
index 14e3f12..77fe4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Sebastian Dietrich <SebDieBln at users.noreply.github.com> 2015-12-30
+
+ read source from provider before saving memory layer (fixes #8997)
+
+ (cherry picked from commit dbc0f072c638981db982011776d7b110215e80b7)
+
+rldhont <rldhont at gmail.com> 2016-01-13
+
+ DBManager oracle plugin: strip '"' on unique col
+
+ For Oracle provider, giving a quoted uniqueColumn in a uri to create a
+ QgsVectorLayer results in an invalid layer.
+
+ To fix it, strip '"' is applied to unique col.
+
+Bas Couwenberg <sebastic at xs4all.nl> 2015-12-23
+
+ Add dependency on openscenegraph-plugin-osgearth to qgis-plugin-globe.
+
+ QGIS crashes when using the Globe plugin if this package is not installed,
+ as reported in QGIS issue #9818 [0] and Debian Bug #808817 [1].
+
+ [0] https://hub.qgis.org/issues/9818
+ [1] https://bugs.debian.org/808817
+
+ (cherry picked from commit 076c2a09b707c2b1c59985d27ad79b0a2a580000)
+
+Médéric Ribreux <medspx at medspx.fr> 2015-10-23
+
+ DBManager: support timestamp values for Oracle
+
+Juergen E. Fischer <jef at norbit.de> 2015-12-21
+
+ osgeo4w: include grass7 plugin
+
+ (cherry picked from commit e19ad4be77cc9dfd98f36f70d096577ef9049809)
+
+Juergen E. Fischer <jef at norbit.de> 2015-12-18
+
+ Release of 2.12.2
+
rldhont <rldhont at gmail.com> 2015-12-18
[BUGFIX] WFS GetCapabilities respons misses <keywords> key
diff --git a/debian/changelog b/debian/changelog
index 0a2af33..6a03145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.12.2) UNRELEASED; urgency=medium
+qgis (2.12.3) UNRELEASED; urgency=medium
+
+ * Release of 2.12.3
+
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 15 Jan 2016 13:00:55 +0100
+
+qgis (2.12.2) unstable; urgency=medium
* Release of 2.12.2
- -- Jürgen E. Fischer <jef at norbit.de> Fri, 18 Dec 2015 14:21:33 +0100
+ -- Jürgen E. Fischer <jef at norbit.de> Fri, 15 Jan 2016 13:00:55 +0100
qgis (2.12.1) unstable; urgency=medium
diff --git a/debian/control.in b/debian/control.in
index 218da77..55898db 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -340,6 +340,7 @@ Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
+ openscenegraph-plugin-osgearth,
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
index 0b098c3..0badb06 100644
--- a/ms-windows/osgeo4w/package.cmd
+++ b/ms-windows/osgeo4w/package.cmd
@@ -430,24 +430,20 @@ for %%g IN (%GRASS_VERSIONS%) do (
set w=!v!
if !v!==6 set w=
- set files="apps/%PACKAGENAME%/bin/qgisgrass!v!.dll" ^
+ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin!w!/%PACKAGENAME%-grass-plugin!w!-%VERSION%-%PACKAGE%.tar.bz2 ^
+ "apps/%PACKAGENAME%/bin/qgisgrass!v!.dll" ^
+ "apps/%PACKAGENAME%/grass/bin/qgis.g.browser!v!.exe" ^
"apps/%PACKAGENAME%/grass/modules/qgis.d.rast!v!.exe" ^
"apps/%PACKAGENAME%/grass/modules/qgis.g.info!v!.exe" ^
"apps/%PACKAGENAME%/grass/modules/qgis.r.in!v!.exe" ^
"apps/%PACKAGENAME%/grass/modules/qgis.v.in!v!.exe" ^
- "apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
+ "apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
"apps/%PACKAGENAME%/plugins/grassprovider!v!.dll" ^
- "bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
+ "apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
"bin/%PACKAGENAME%-browser-grass!v!.bat.tmpl" ^
+ "bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
"etc/postinstall/%PACKAGENAME%-grass-plugin!w!.bat" ^
"etc/preremove/%PACKAGENAME%-grass-plugin!w!.bat"
-
- if !v!==6 set files=!files! ^
- "apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
- "apps/%PACKAGENAME%/grass/bin/qgis.g.browser!v!.exe"
-
- tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin!w!/%PACKAGENAME%-grass-plugin!w!-%VERSION%-%PACKAGE%.tar.bz2 ^
- !files!
if errorlevel 1 (echo tar grass-plugin!w! failed & goto error)
)
diff --git a/python/plugins/db_manager/db_plugins/oracle/data_model.py b/python/plugins/db_manager/db_plugins/oracle/data_model.py
index 2476da1..ad10001 100644
--- a/python/plugins/db_manager/db_plugins/oracle/data_model.py
+++ b/python/plugins/db_manager/db_plugins/oracle/data_model.py
@@ -64,6 +64,9 @@ class ORTableDataModel(TableDataModel):
if field.dataType.upper() == u"DATE":
return u"CAST({} AS VARCHAR2(8))".format(
self.db.quoteId(field.name))
+ if u"TIMESTAMP" in field.dataType.upper():
+ return u"TO_CHAR({}, 'YYYY-MM-DD HH:MI:SS.FF')".format(
+ self.db.quoteId(field.name))
if field.dataType.upper() == u"NUMBER":
if not field.charMaxLen:
return u"CAST({} AS VARCHAR2(135))".format(
diff --git a/python/plugins/db_manager/db_plugins/oracle/plugin.py b/python/plugins/db_manager/db_plugins/oracle/plugin.py
index 7b85d6a..93c51be 100644
--- a/python/plugins/db_manager/db_plugins/oracle/plugin.py
+++ b/python/plugins/db_manager/db_plugins/oracle/plugin.py
@@ -203,7 +203,7 @@ class ORDatabase(Database):
uri = self.uri()
con = self.database().connector
- uri.setDataSource(u"", u"({})".format(sql), geomCol, u"", uniqueCol)
+ uri.setDataSource(u"", u"({})".format(sql), geomCol, u"", uniqueCol.strip(u'"'))
if avoidSelectById:
uri.disableSelectAtId(True)
provider = self.dbplugin().providerName()
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
index 29b92a2..81bcf86 100644
--- a/src/core/qgsmaplayer.cpp
+++ b/src/core/qgsmaplayer.cpp
@@ -46,6 +46,7 @@
#include "qgsrasterlayer.h"
#include "qgsrectangle.h"
#include "qgsvectorlayer.h"
+#include "qgsvectordataprovider.h"
QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
@@ -559,6 +560,11 @@ bool QgsMapLayer::writeLayerXML( QDomElement& layerElement, QDomDocument& docume
urlDest.setQueryItems( urlSource.queryItems() );
src = QString::fromAscii( urlDest.toEncoded() );
}
+ else if ( vlayer && vlayer->providerType() == "memory" )
+ {
+ // Refetch the source from the provider, because adding fields actually changes the source for this provider.
+ src = vlayer->dataProvider()->dataSourceUri();
+ }
else
{
bool handled = false;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list