This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 858ccf625449812d419a2d699945fcf541f52bce Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Jul 30 01:40:47 2015 +0200 Drop patches included upstream, refresh remaining patches. --- debian/changelog | 1 + ...patialite-initialization-scheme-via-thin-.patch | 812 --------------------- debian/patches/0001-fix-arm-build.patch | 4 +- debian/patches/allows-to-typo.patch | 76 +- .../patches/developersmap-use-debian-package.patch | 9 +- debian/patches/series | 1 - 6 files changed, 46 insertions(+), 857 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d2505d..6f0dd66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qgis (2.8.3+dfsg-1) UNRELEASED; urgency=medium [ Bas Couwenberg ] * New upstream release. + * Drop patches included upstream, refresh remaining patches. -- Bas Couwenberg <sebas...@debian.org> Thu, 30 Jul 2015 01:31:54 +0200 diff --git a/debian/patches/0001-adopt-new-spatialite-initialization-scheme-via-thin-.patch b/debian/patches/0001-adopt-new-spatialite-initialization-scheme-via-thin-.patch deleted file mode 100644 index e77da46..0000000 --- a/debian/patches/0001-adopt-new-spatialite-initialization-scheme-via-thin-.patch +++ /dev/null @@ -1,812 +0,0 @@ -From d7ca190295079957a8d0ef446cd834351020e901 Mon Sep 17 00:00:00 2001 -From: "Juergen E. Fischer" <j...@norbit.de> -Date: Tue, 26 May 2015 13:27:08 +0200 -Subject: adopt 'new' spatialite initialization scheme via thin wrapper around - sqlite3_open and sqlite3_close (fixes #12771) -Origin: https://github.com/qgis/QGIS/commit/d7ca190295079957a8d0ef446cd834351020e901 -Bug: http://hub.qgis.org/issues/12771 -Bug-Debian: https://bugs.debian.org/788101 -Bug-Debian: https://bugs.debian.org/791680 - -(cherry picked from commit 252aaab, 23ef9da, d4b72a2, c7cb963 and e255d6c) ---- - CMakeLists.txt | 10 +++ - cmake/FindSPATIALITE.cmake | 1 + - python/ext-libs/pyspatialite/src/connection.c | 16 +++- - python/ext-libs/pyspatialite/src/connection.h | 3 +- - src/analysis/openstreetmap/qgsosmdatabase.cpp | 13 +--- - src/analysis/openstreetmap/qgsosmimport.cpp | 10 +-- - src/app/qgsnewspatialitelayerdialog.cpp | 24 +++--- - src/core/CMakeLists.txt | 1 + - src/core/qgsofflineediting.cpp | 13 ++-- - src/core/qgsslconnect.cpp | 89 ++++++++++++++++++++++ - src/core/qgsslconnect.h | 39 ++++++++++ - src/providers/spatialite/CMakeLists.txt | 8 -- - .../spatialite/qgsspatialiteconnection.cpp | 16 ++-- - src/providers/spatialite/qgsspatialiteconnection.h | 2 - - src/providers/spatialite/qgsspatialiteprovider.cpp | 56 ++++++-------- - .../spatialite/qspatialite/CMakeLists.txt | 1 + - .../spatialite/qspatialite/qsql_spatialite.cpp | 8 +- - 17 files changed, 213 insertions(+), 97 deletions(-) - create mode 100644 src/core/qgsslconnect.cpp - create mode 100644 src/core/qgsslconnect.h - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,6 +199,16 @@ ENDIF (WITH_POSTGRESQL) - - FIND_PACKAGE(SPATIALITE REQUIRED) - -+IF(SPATIALITE_VERSION_GE_4_0_0) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_GE_4_0_0") -+ENDIF(SPATIALITE_VERSION_GE_4_0_0) -+IF(SPATIALITE_VERSION_G_4_1_1) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_G_4_1_1") -+ENDIF(SPATIALITE_VERSION_G_4_1_1) -+IF(SPATIALITE_HAS_INIT_EX) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_HAS_INIT_EX") -+ENDIF(SPATIALITE_HAS_INIT_EX) -+ - IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND) - MESSAGE (SEND_ERROR "Some dependencies were not found!") - ENDIF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND) ---- a/cmake/FindSPATIALITE.cmake -+++ b/cmake/FindSPATIALITE.cmake -@@ -70,6 +70,7 @@ IF (SPATIALITE_FOUND) - ENDIF(APPLE) - check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0) - check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_G_4_1_1) -+ check_library_exists("${SPATIALITE_LIBRARY}" spatialite_init_ex "" SPATIALITE_HAS_INIT_EX) - - ELSE (SPATIALITE_FOUND) - ---- a/python/ext-libs/pyspatialite/src/connection.c -+++ b/python/ext-libs/pyspatialite/src/connection.c -@@ -29,6 +29,7 @@ - #include "prepare_protocol.h" - #include "util.h" - #include "sqlitecompat.h" -+#include "spatialite.h" - - #include "pythread.h" - -@@ -81,7 +82,6 @@ int pysqlite_connection_init(pysqlite_Co - } - - self->initialized = 1; -- spatialite_init(0); - self->begin_statement = NULL; - - self->statement_cache = NULL; -@@ -106,7 +106,15 @@ int pysqlite_connection_init(pysqlite_Co - } - - Py_BEGIN_ALLOW_THREADS -+#if defined(SPATIALITE_HAS_INIT_EX) -+ self->slconn = spatialite_alloc_connection(); -+#else -+ spatialite_init( 0 ); -+#endif - rc = sqlite3_open(PyString_AsString(database_utf8), &self->db); -+#if defined(SPATIALITE_HAS_INIT_EX) -+ spatialite_init_ex( self->db, self->slconn, 0 ); -+#endif - Py_END_ALLOW_THREADS - - Py_DECREF(database_utf8); -@@ -272,6 +280,9 @@ void pysqlite_connection_dealloc(pysqlit - if (self->db) { - Py_BEGIN_ALLOW_THREADS - sqlite3_close(self->db); -+#if defined(SPATIALITE_HAS_INIT_EX) -+ spatialite_cleanup_ex( self->slconn ); -+#endif - Py_END_ALLOW_THREADS - } else if (self->apsw_connection) { - ret = PyObject_CallMethod(self->apsw_connection, "close", ""); -@@ -372,6 +383,9 @@ PyObject* pysqlite_connection_close(pysq - } else { - Py_BEGIN_ALLOW_THREADS - rc = sqlite3_close(self->db); -+#if defined(SPATIALITE_HAS_INIT_EX) -+ spatialite_cleanup_ex( self->slconn ); -+#endif - Py_END_ALLOW_THREADS - - if (rc != SQLITE_OK) { ---- a/python/ext-libs/pyspatialite/src/connection.h -+++ b/python/ext-libs/pyspatialite/src/connection.h -@@ -33,12 +33,11 @@ - #include "sqlite3.h" - #include "spatialite.h" - --// int spatialite_init(int verbose); -- - typedef struct - { - PyObject_HEAD - sqlite3* db; -+ void *slconn; - - /* 1 if we are currently within a transaction, i. e. if a BEGIN has been - * issued */ ---- a/src/analysis/openstreetmap/qgsosmdatabase.cpp -+++ b/src/analysis/openstreetmap/qgsosmdatabase.cpp -@@ -14,14 +14,11 @@ - ***************************************************************************/ - - #include "qgsosmdatabase.h" -- --#include <spatialite.h> -- -+#include "qgsslconnect.h" - #include "qgsgeometry.h" - #include "qgslogger.h" - - -- - QgsOSMDatabase::QgsOSMDatabase( const QString& dbFileName ) - : mDbFileName( dbFileName ) - , mDatabase( 0 ) -@@ -32,7 +29,6 @@ QgsOSMDatabase::QgsOSMDatabase( const QS - , mStmtWayNodePoints( 0 ) - , mStmtWayTags( 0 ) - { -- - } - - QgsOSMDatabase::~QgsOSMDatabase() -@@ -49,11 +45,8 @@ bool QgsOSMDatabase::isOpen() const - - bool QgsOSMDatabase::open() - { -- // load spatialite extension -- spatialite_init( 0 ); -- - // open database -- int res = sqlite3_open_v2( mDbFileName.toUtf8().data(), &mDatabase, SQLITE_OPEN_READWRITE, 0 ); -+ int res = QgsSLConnect::sqlite3_open_v2( mDbFileName.toUtf8().data(), &mDatabase, SQLITE_OPEN_READWRITE, 0 ); - if ( res != SQLITE_OK ) - { - mError = QString( "Failed to open database [%1]: %2" ).arg( res ).arg( mDbFileName ); -@@ -93,7 +86,7 @@ bool QgsOSMDatabase::close() - Q_ASSERT( mStmtNode == 0 ); - - // close database -- if ( sqlite3_close( mDatabase ) != SQLITE_OK ) -+ if ( QgsSLConnect::sqlite3_close( mDatabase ) != SQLITE_OK ) - { - //mError = ( char * ) "Closing SQLite3 database failed."; - //return false; ---- a/src/analysis/openstreetmap/qgsosmimport.cpp -+++ b/src/analysis/openstreetmap/qgsosmimport.cpp -@@ -14,8 +14,7 @@ - ***************************************************************************/ - - #include "qgsosmimport.h" -- --#include <spatialite.h> -+#include "qgsslconnect.h" - - #include <QStringList> - #include <QXmlStreamReader> -@@ -57,9 +56,6 @@ bool QgsOSMXmlImport::import() - } - } - -- // load spatialite extension -- spatialite_init( 0 ); -- - if ( !createDatabase() ) - { - // mError is set in createDatabase() -@@ -137,7 +133,7 @@ bool QgsOSMXmlImport::createDatabase() - { - char **results; - int rows, columns; -- if ( sqlite3_open_v2( mDbFileName.toUtf8().data(), &mDatabase, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0 ) != SQLITE_OK ) -+ if ( QgsSLConnect::sqlite3_open_v2( mDbFileName.toUtf8().data(), &mDatabase, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0 ) != SQLITE_OK ) - return false; - - bool above41 = false; -@@ -238,7 +234,7 @@ bool QgsOSMXmlImport::closeDatabase() - - Q_ASSERT( mStmtInsertNode == 0 ); - -- sqlite3_close( mDatabase ); -+ QgsSLConnect::sqlite3_close( mDatabase ); - mDatabase = 0; - return true; - } ---- a/src/app/qgsnewspatialitelayerdialog.cpp -+++ b/src/app/qgsnewspatialitelayerdialog.cpp -@@ -24,10 +24,11 @@ - #include "qgsapplication.h" - #include "qgsproviderregistry.h" - #include "qgisapp.h" // <- for theme icons --#include <qgsvectorlayer.h> --#include <qgsmaplayerregistry.h> -+#include "qgsvectorlayer.h" -+#include "qgsmaplayerregistry.h" - #include "qgscoordinatereferencesystem.h" - #include "qgsgenericprojectionselector.h" -+#include "qgsslconnect.h" - - #include "qgslogger.h" - -@@ -196,14 +197,11 @@ void QgsNewSpatialiteLayerDialog::on_pbn - // to build filter for projection selector - sqlite3 *db = 0; - bool status = true; -- if ( !db ) -+ int rc = sqlite3_open_v2( mDatabaseComboBox->currentText().toUtf8(), &db, SQLITE_OPEN_READONLY, NULL ); -+ if ( rc != SQLITE_OK ) - { -- int rc = sqlite3_open_v2( mDatabaseComboBox->currentText().toUtf8(), &db, SQLITE_OPEN_READONLY, NULL ); -- if ( rc != SQLITE_OK ) -- { -- QMessageBox::warning( this, tr( "SpatiaLite Database" ), tr( "Unable to open the database" ) ); -- return; -- } -+ QMessageBox::warning( this, tr( "SpatiaLite Database" ), tr( "Unable to open the database" ) ); -+ return; - } - - // load up the srid table -@@ -213,7 +211,7 @@ void QgsNewSpatialiteLayerDialog::on_pbn - - QSet<QString> myCRSs; - -- int rc = sqlite3_prepare( db, sql.toUtf8(), sql.toUtf8().length(), &ppStmt, &pzTail ); -+ rc = sqlite3_prepare( db, sql.toUtf8(), sql.toUtf8().length(), &ppStmt, &pzTail ); - // XXX Need to free memory from the error msg if one is set - if ( rc == SQLITE_OK ) - { -@@ -381,10 +379,8 @@ bool QgsNewSpatialiteLayerDialog::apply( - .arg( quotedValue( leGeometryColumn->text() ) ); - QgsDebugMsg( sqlCreateIndex ); // OK - -- spatialite_init( 0 ); -- - sqlite3 *db; -- int rc = sqlite3_open( mDatabaseComboBox->currentText().toUtf8(), &db ); -+ int rc = QgsSLConnect::sqlite3_open( mDatabaseComboBox->currentText().toUtf8(), &db ); - if ( rc != SQLITE_OK ) - { - QMessageBox::warning( this, -@@ -447,6 +443,8 @@ bool QgsNewSpatialiteLayerDialog::apply( - } - } - } -+ -+ QgsSLConnect::sqlite3_close( db ); - } - - return false; ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -173,6 +173,7 @@ SET(QGIS_CORE_SRCS - qgsvectorlayerundocommand.cpp - qgsvectorsimplifymethod.cpp - qgsxmlutils.cpp -+ qgsslconnect.cpp - - composer/qgsaddremoveitemcommand.cpp - composer/qgsaddremovemultiframecommand.cpp ---- a/src/core/qgsofflineediting.cpp -+++ b/src/core/qgsofflineediting.cpp -@@ -29,6 +29,7 @@ - #include "qgsvectordataprovider.h" - #include "qgsvectorlayereditbuffer.h" - #include "qgsvectorlayerjoinbuffer.h" -+#include "qgsslconnect.h" - - #include <QDir> - #include <QDomDocument> -@@ -74,9 +75,8 @@ bool QgsOfflineEditing::convertToOffline - QString dbPath = QDir( offlineDataPath ).absoluteFilePath( offlineDbFile ); - if ( createSpatialiteDB( dbPath ) ) - { -- spatialite_init( 0 ); - sqlite3* db; -- int rc = sqlite3_open( dbPath.toUtf8().constData(), &db ); -+ int rc = QgsSLConnect::sqlite3_open( dbPath.toUtf8().constData(), &db ); - if ( rc != SQLITE_OK ) - { - showWarning( tr( "Could not open the spatialite database" ) ); -@@ -156,7 +156,7 @@ bool QgsOfflineEditing::convertToOffline - - emit progressStopped(); - -- sqlite3_close( db ); -+ QgsSLConnect::sqlite3_close( db ); - - // save offline project - QString projectTitle = QgsProject::instance()->title(); -@@ -380,8 +380,7 @@ bool QgsOfflineEditing::createSpatialite - - // creating/opening the new database - QString dbPath = newDb.fileName(); -- spatialite_init( 0 ); -- ret = sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL ); -+ ret = QgsSLConnect::sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL ); - if ( ret ) - { - // an error occurred -@@ -397,13 +396,13 @@ bool QgsOfflineEditing::createSpatialite - { - showWarning( tr( "Unable to activate FOREIGN_KEY constraints" ) ); - sqlite3_free( errMsg ); -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - return false; - } - initializeSpatialMetadata( sqlite_handle ); - - // all done: closing the DB connection -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - - return true; - } ---- /dev/null -+++ b/src/core/qgsslconnect.cpp -@@ -0,0 +1,89 @@ -+/*************************************************************************** -+ qgsslconnect.cpp - thin wrapper class to connect to spatialite databases -+ ---------------------- -+ begin : May 2015 -+ copyright : (C) 2015 by Jürgen fischer -+ email : jef at norbit dot de -+ *************************************************************************** -+ * * -+ * This program is free software; you can redistribute it and/or modify * -+ * it under the terms of the GNU General Public License as published by * -+ * the Free Software Foundation; either version 2 of the License, or * -+ * (at your option) any later version. * -+ * * -+ ***************************************************************************/ -+ -+#include "qgsslconnect.h" -+ -+#include <sqlite3.h> -+#include <spatialite.h> -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+QHash<sqlite3 *, void *> QgsSLConnect::mSLconns; -+#endif -+ -+int QgsSLConnect::sqlite3_open( const char *filename, sqlite3 **ppDb ) -+{ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ void *conn = spatialite_alloc_connection(); -+#else -+ spatialite_init( 0 ); -+#endif -+ -+ int res = ::sqlite3_open( filename, ppDb ); -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ if ( res == SQLITE_OK ) -+ { -+ spatialite_init_ex( *ppDb, conn, 0 ); -+ mSLconns.insert( *ppDb, conn ); -+ } -+#endif -+ -+ return res; -+} -+ -+int QgsSLConnect::sqlite3_close( sqlite3 *db ) -+{ -+ int res = ::sqlite3_close( db ); -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ if ( mSLconns.contains( db ) ) -+ spatialite_cleanup_ex( mSLconns.take( db ) ); -+#endif -+ -+ return res; -+} -+ -+int QgsSLConnect::sqlite3_open_v2( const char *filename, sqlite3 **ppDb, int flags, const char *zVfs ) -+{ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ void *conn = spatialite_alloc_connection(); -+#else -+ spatialite_init( 0 ); -+#endif -+ -+ int res = ::sqlite3_open_v2( filename, ppDb, flags, zVfs ); -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ if ( res == SQLITE_OK ) -+ { -+ spatialite_init_ex( *ppDb, conn, 0 ); -+ mSLconns.insert( *ppDb, conn ); -+ } -+#endif -+ -+ return res; -+} -+ -+int QgsSLConnect::sqlite3_close_v2( sqlite3 *db ) -+{ -+ int res = ::sqlite3_close( db ); -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ if ( mSLconns.contains( db ) ) -+ spatialite_cleanup_ex( mSLconns.take( db ) ); -+#endif -+ -+ return res; -+} ---- /dev/null -+++ b/src/core/qgsslconnect.h -@@ -0,0 +1,39 @@ -+/*************************************************************************** -+ qgsslconnect.h - thin wrapper class to connect to spatialite databases -+ ---------------------- -+ begin : May 2015 -+ copyright : (C) 2015 by Jürgen fischer -+ email : jef at norbit dot de -+ *************************************************************************** -+ * * -+ * This program is free software; you can redistribute it and/or modify * -+ * it under the terms of the GNU General Public License as published by * -+ * the Free Software Foundation; either version 2 of the License, or * -+ * (at your option) any later version. * -+ * * -+ ***************************************************************************/ -+ -+#ifndef QGSSLCONNECT_H -+#define QGSSLCONNECT_H -+ -+#include <QHash> -+ -+class sqlite3; -+ -+class CORE_EXPORT QgsSLConnect -+{ -+ public: -+ static int sqlite3_open( const char *filename, sqlite3 **ppDb ); -+ static int sqlite3_close( sqlite3* ); -+ -+ static int sqlite3_open_v2( const char *filename, sqlite3 **ppDb, int flags, const char *zVfs ); -+ static int sqlite3_close_v2( sqlite3* ); -+ -+#if defined(SPATIALITE_HAS_INIT_EX) -+ private: -+ static QHash<sqlite3 *, void *> mSLconns; -+#endif -+}; -+ -+#endif -+ ---- a/src/providers/spatialite/CMakeLists.txt -+++ b/src/providers/spatialite/CMakeLists.txt -@@ -30,14 +30,6 @@ SET(SPATIALITE_MOC_HDRS - - QT4_WRAP_CPP(SPATIALITE_MOC_SRCS ${SPATIALITE_MOC_HDRS}) - --IF(SPATIALITE_VERSION_GE_4_0_0) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_GE_4_0_0") --ENDIF(SPATIALITE_VERSION_GE_4_0_0) --IF(SPATIALITE_VERSION_G_4_1_1) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_G_4_1_1") --ENDIF(SPATIALITE_VERSION_G_4_1_1) -- -- - INCLUDE_DIRECTORIES( - ${QSCINTILLA_INCLUDE_DIR} - ../../core ---- a/src/providers/spatialite/qgsspatialiteconnection.cpp -+++ b/src/providers/spatialite/qgsspatialiteconnection.cpp -@@ -13,6 +13,7 @@ - * * - ***************************************************************************/ - #include "qgsspatialiteconnection.h" -+#include "qgsslconnect.h" - - #include <QFileInfo> - #include <QSettings> -@@ -67,7 +68,7 @@ QgsSpatiaLiteConnection::Error QgsSpatia - return NotExists; - } - -- sqlite3* handle = openSpatiaLiteDb( fi.canonicalFilePath() ); -+ sqlite3 *handle = openSpatiaLiteDb( fi.canonicalFilePath() ); - if ( handle == NULL ) - { - return FailedToOpen; -@@ -138,11 +139,8 @@ sqlite3 *QgsSpatiaLiteConnection::openSp - { - sqlite3 *handle = NULL; - int ret; -- // activating the SpatiaLite library -- spatialite_init( 0 ); -- - // trying to open the SQLite DB -- ret = sqlite3_open_v2( path.toUtf8().constData(), &handle, SQLITE_OPEN_READWRITE, NULL ); -+ ret = QgsSLConnect::sqlite3_open_v2( path.toUtf8().constData(), &handle, SQLITE_OPEN_READWRITE, NULL ); - if ( ret ) - { - // failure -@@ -155,7 +153,7 @@ sqlite3 *QgsSpatiaLiteConnection::openSp - void QgsSpatiaLiteConnection::closeSpatiaLiteDb( sqlite3 * handle ) - { - if ( handle ) -- sqlite3_close( handle ); -+ QgsSLConnect::sqlite3_close( handle ); - } - - int QgsSpatiaLiteConnection::checkHasMetadataTables( sqlite3* handle ) -@@ -745,7 +743,7 @@ QgsSqliteHandle* QgsSqliteHandle::openDb - } - - QgsDebugMsg( QString( "New sqlite connection for " ) + dbPath ); -- if ( sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, shared ? SQLITE_OPEN_READWRITE : SQLITE_OPEN_READONLY | SQLITE_OPEN_NOMUTEX, NULL ) ) -+ if ( QgsSLConnect::sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, shared ? SQLITE_OPEN_READWRITE : SQLITE_OPEN_READONLY | SQLITE_OPEN_NOMUTEX, NULL ) ) - { - // failure - QgsDebugMsg( QString( "Failure while connecting to: %1\n%2" ) -@@ -759,7 +757,7 @@ QgsSqliteHandle* QgsSqliteHandle::openDb - { - // failure - QgsDebugMsg( QString( "Failure while connecting to: %1\n\ninvalid metadata tables" ).arg( dbPath ) ); -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - return NULL; - } - // activating Foreign Key constraints -@@ -818,7 +816,7 @@ void QgsSqliteHandle::sqliteClose() - { - if ( sqlite_handle ) - { -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - sqlite_handle = NULL; - } - } ---- a/src/providers/spatialite/qgsspatialiteconnection.h -+++ b/src/providers/spatialite/qgsspatialiteconnection.h -@@ -124,8 +124,6 @@ class QgsSpatiaLiteConnection : public Q - QList<TableEntry> mTables; - }; - -- -- - class QgsSqliteHandle - { - // ---- a/src/providers/spatialite/qgsspatialiteprovider.cpp -+++ b/src/providers/spatialite/qgsspatialiteprovider.cpp -@@ -14,24 +14,23 @@ email : a.furi...@lqt.it - * * - ***************************************************************************/ - --#include <qgis.h> --#include <qgsapplication.h> --#include <qgsfeature.h> --#include <qgsfield.h> --#include <qgsgeometry.h> --#include <qgsmessageoutput.h> --#include <qgsrectangle.h> --#include <qgscoordinatereferencesystem.h> -+#include "qgis.h" -+#include "qgsapplication.h" -+#include "qgsfeature.h" -+#include "qgsfield.h" -+#include "qgsgeometry.h" -+#include "qgsmessageoutput.h" -+#include "qgsrectangle.h" -+#include "qgscoordinatereferencesystem.h" - #include "qgslogger.h" - #include "qgsmessagelog.h" - #include "qgsvectorlayerimport.h" -- --#include <QMessageBox> -- -+#include "qgsslconnect.h" - #include "qgsspatialiteprovider.h" - #include "qgsspatialiteconnpool.h" - #include "qgsspatialitefeatureiterator.h" - -+#include <QMessageBox> - #include <QFileInfo> - #include <QDir> - -@@ -43,8 +42,6 @@ const QString SPATIALITE_KEY = "spatiali - const QString SPATIALITE_DESCRIPTION = "SpatiaLite data provider"; - - -- -- - bool QgsSpatiaLiteProvider::convertField( QgsField &field ) - { - QString fieldType = "TEXT"; //default to string -@@ -96,6 +93,7 @@ bool QgsSpatiaLiteProvider::convertField - return true; - } - -+ - QgsVectorLayerImport::ImportError - QgsSpatiaLiteProvider::createEmptyLayer( - const QString& uri, -@@ -133,9 +131,8 @@ QgsSpatiaLiteProvider::createEmptyLayer( - QString sql; - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( sqlitePath ); -- if ( handle == NULL ) -+ if ( !handle ) - { - QgsDebugMsg( "Connection to database failed. Import of layer aborted." ); - if ( errorMessage ) -@@ -182,12 +179,13 @@ QgsSpatiaLiteProvider::createEmptyLayer( - if ( primaryKeyType.isEmpty() ) - { - primaryKeyType = "INTEGER"; -- /* TODO -+#if 0 // TODO - // check the feature count to choose if create a bigint pk field - if ( layer->featureCount() > 0xFFFFFF ) - { - primaryKeyType = "BIGINT"; -- }*/ -+ } -+#endif - } - - try -@@ -408,7 +406,6 @@ QgsSpatiaLiteProvider::createEmptyLayer( - } - - -- - QgsSpatiaLiteProvider::QgsSpatiaLiteProvider( QString const &uri ) - : QgsVectorDataProvider( uri ) - , valid( false ) -@@ -439,9 +436,8 @@ QgsSpatiaLiteProvider::QgsSpatiaLiteProv - mQuery = mTableName; - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( mSqlitePath ); -- if ( handle == NULL ) -+ if ( !handle ) - { - return; - } -@@ -5058,15 +5054,14 @@ QGISEXTERN bool createDb( const QString& - QDir().mkpath( path.absolutePath() ); - - // creating/opening the new database -- spatialite_init( 0 ); - sqlite3 *sqlite_handle; -- int ret = sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL ); -+ int ret = QgsSLConnect::sqlite3_open_v2( dbPath.toUtf8().constData(), &sqlite_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL ); - if ( ret ) - { - // an error occurred - errCause = QObject::tr( "Could not create a new database\n" ); - errCause += QString::fromUtf8( sqlite3_errmsg( sqlite_handle ) ); -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - return false; - } - // activating Foreign Key constraints -@@ -5076,13 +5071,13 @@ QGISEXTERN bool createDb( const QString& - { - errCause = QObject::tr( "Unable to activate FOREIGN_KEY constraints [%1]" ).arg( errMsg ); - sqlite3_free( errMsg ); -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - return false; - } - bool init_res = ::initializeSpatialMetadata( sqlite_handle, errCause ); - - // all done: closing the DB connection -- sqlite3_close( sqlite_handle ); -+ QgsSLConnect::sqlite3_close( sqlite_handle ); - - return init_res; - } -@@ -5093,7 +5088,6 @@ QGISEXTERN bool deleteLayer( const QStri - { - QgsDebugMsg( "deleting layer " + tableName ); - -- spatialite_init( 0 ); - QgsSqliteHandle* hndl = QgsSqliteHandle::openDb( dbPath ); - if ( !hndl ) - { -@@ -5174,9 +5168,8 @@ QGISEXTERN bool saveStyle( const QString - QgsDebugMsg( "Database is: " + sqlitePath ); - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( sqlitePath ); -- if ( NULL == handle ) -+ if ( !handle ) - { - QgsDebugMsg( "Connection to database failed. Save style aborted." ); - errCause = QObject::tr( "Connection to database failed" ); -@@ -5364,9 +5357,8 @@ QGISEXTERN QString loadStyle( const QStr - QgsDebugMsg( "Database is: " + sqlitePath ); - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( sqlitePath ); -- if ( NULL == handle ) -+ if ( !handle ) - { - QgsDebugMsg( "Connection to database failed. Save style aborted." ); - errCause = QObject::tr( "Connection to database failed" ); -@@ -5420,7 +5412,6 @@ QGISEXTERN int listStyles( const QString - QgsDebugMsg( "Database is: " + sqlitePath ); - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( sqlitePath ); - if ( NULL == handle ) - { -@@ -5533,9 +5524,8 @@ QGISEXTERN QString getStyleById( const Q - QgsDebugMsg( "Database is: " + sqlitePath ); - - // trying to open the SQLite DB -- spatialite_init( 0 ); - handle = QgsSqliteHandle::openDb( sqlitePath ); -- if ( NULL == handle ) -+ if ( !handle ) - { - QgsDebugMsg( "Connection to database failed. Save style aborted." ); - errCause = QObject::tr( "Connection to database failed" ); ---- a/src/providers/spatialite/qspatialite/CMakeLists.txt -+++ b/src/providers/spatialite/qspatialite/CMakeLists.txt -@@ -17,6 +17,7 @@ TARGET_LINK_LIBRARIES(qsqlspatialite - ${QT_QTSQL_LIBRARY} - ${SQLITE3_LIBRARY} - ${SPATIALITE_LIBRARY} -+ qgis_core - ) - - INSTALL(TARGETS qsqlspatialite ---- a/src/providers/spatialite/qspatialite/qsql_spatialite.cpp -+++ b/src/providers/spatialite/qspatialite/qsql_spatialite.cpp -@@ -58,7 +58,7 @@ - #endif - - #include <sqlite3.h> --#include <spatialite.h> -+#include <qgsslconnect.h> - - Q_DECLARE_METATYPE(sqlite3*) - Q_DECLARE_METATYPE(sqlite3_stmt*) -@@ -548,8 +548,6 @@ bool QSpatiaLiteDriver::open(const QStri - if (db.isEmpty()) - return false; - -- spatialite_init(0); -- - bool sharedCache = false; - int openMode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, timeOut=5000; - QStringList opts=QString(conOpts).remove(QLatin1Char(' ')).split(QLatin1Char(';')); -@@ -568,7 +566,7 @@ bool QSpatiaLiteDriver::open(const QStri - - sqlite3_enable_shared_cache(sharedCache); - -- if (sqlite3_open_v2(db.toUtf8().constData(), &d->access, openMode, NULL) == SQLITE_OK) { -+ if (QgsSLConnect::sqlite3_open_v2(db.toUtf8().constData(), &d->access, openMode, NULL) == SQLITE_OK) { - sqlite3_busy_timeout(d->access, timeOut); - setOpen(true); - setOpenError(false); -@@ -587,7 +585,7 @@ void QSpatiaLiteDriver::close() - foreach (QSpatiaLiteResult *result, d->results) - result->d->finalize(); - -- if (sqlite3_close(d->access) != SQLITE_OK) -+ if (QgsSLConnect::sqlite3_close(d->access) != SQLITE_OK) - setLastError(qMakeError(d->access, tr("Error closing database"), - QSqlError::ConnectionError)); - d->access = 0; diff --git a/debian/patches/0001-fix-arm-build.patch b/debian/patches/0001-fix-arm-build.patch index 04bf77a..c9ec68f 100644 --- a/debian/patches/0001-fix-arm-build.patch +++ b/debian/patches/0001-fix-arm-build.patch @@ -117,7 +117,7 @@ Origin: https://github.com/qgis/QGIS/commit/1aff7335d004bc410eb61e1436ee7648716f --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp -@@ -1838,7 +1838,7 @@ bool QgsComposerMapGrid::shouldShowDivis +@@ -1850,7 +1850,7 @@ bool QgsComposerMapGrid::shouldShowDivis || ( mode == QgsComposerMapGrid::LongitudeOnly && coordinate == QgsComposerMapGrid::Longitude ); } @@ -126,7 +126,7 @@ Origin: https://github.com/qgis/QGIS/commit/1aff7335d004bc410eb61e1436ee7648716f { return a.first < b.first; } -@@ -1885,7 +1885,7 @@ QgsComposerMapGrid::BorderSide QgsCompos +@@ -1897,7 +1897,7 @@ QgsComposerMapGrid::BorderSide QgsCompos } //otherwise, guess side based on closest map side to point diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch index 19b25c8..05cd59b 100644 --- a/debian/patches/allows-to-typo.patch +++ b/debian/patches/allows-to-typo.patch @@ -5,7 +5,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 --- a/ChangeLog +++ b/ChangeLog -@@ -18703,7 +18703,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> +@@ -19654,7 +19654,7 @@ Denis Rouzaud <denis.rouz...@gmail.com> Salvatore Larosa <lrssv...@gmail.com> 2014-04-28 @@ -14,7 +14,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Nyall Dawson <nyall.daw...@gmail.com> 2014-04-28 -@@ -27163,7 +27163,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -28114,7 +28114,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 AttributeForm: Create a dummy button box for intercepting ok clicks when the ok button is hidden and the accept was actually triggered @@ -23,7 +23,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 logic without changes. Fixes #8885 -@@ -28188,7 +28188,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -29139,7 +29139,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-11-02 @@ -32,7 +32,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa <lrssv...@gmail.com> 2013-10-24 -@@ -28196,7 +28196,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -29147,7 +29147,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-10-24 @@ -41,7 +41,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek <radim.bla...@gmail.com> 2013-11-02 -@@ -30079,7 +30079,7 @@ Tim Sutton <t...@linfiniti.com> 2013-09-1 +@@ -31030,7 +31030,7 @@ Tim Sutton <t...@linfiniti.com> 2013-09-1 Salvatore Larosa <lrssv...@gmail.com> 2013-09-20 @@ -50,7 +50,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 yellow-sky <nikuli...@gmail.com> 2013-09-20 -@@ -30540,7 +30540,7 @@ Stéphane Brunner <courriel@stephane-bru +@@ -31491,7 +31491,7 @@ Stéphane Brunner <courriel@stephane-bru Salvatore Larosa <lrssv...@gmail.com> 2013-09-14 @@ -59,7 +59,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Victor Olaya <vola...@gmail.com> 2013-09-11 -@@ -33065,7 +33065,7 @@ Alexander Bruy <alexander.b...@gmail.com +@@ -34016,7 +34016,7 @@ Alexander Bruy <alexander.b...@gmail.com Alexander Bruy <alexander.b...@gmail.com> 2013-08-06 @@ -68,7 +68,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Minoru Akagi <akagi...@gmail.com> 2013-07-18 -@@ -36866,7 +36866,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- +@@ -37817,7 +37817,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- more edit widget fixes: - handle editable state in drag&drop forms like in automatically generated forms @@ -77,7 +77,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Borys Jurgiel <i...@borysjurgiel.pl> 2013-06-05 -@@ -38087,10 +38087,10 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -39038,10 +39038,10 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-05-20 @@ -90,7 +90,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fix for mousePressEvent into console Juergen E. Fischer <j...@norbit.de> 2013-05-20 -@@ -38335,7 +38335,7 @@ Radim Blazek <radim.bla...@gmail.com> 20 +@@ -39286,7 +39286,7 @@ Radim Blazek <radim.bla...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-05-15 @@ -99,7 +99,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fixes some translation string Marco Hugentobler <marco.hugentob...@sourcepole.ch> 2013-05-15 -@@ -39837,7 +39837,7 @@ D'Hont René-Luc <rldh...@gmail.com> 201 +@@ -40788,7 +40788,7 @@ D'Hont René-Luc <rldh...@gmail.com> 201 olivierdalang <olivier.dal...@gmail.com> 2013-04-24 @@ -108,7 +108,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Radim Blazek <radim.bla...@gmail.com> 2013-04-24 -@@ -39975,7 +39975,7 @@ Chris Crook <ccr...@linz.govt.nz> 2013-0 +@@ -40926,7 +40926,7 @@ Chris Crook <ccr...@linz.govt.nz> 2013-0 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 @@ -117,7 +117,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 -@@ -40006,7 +40006,7 @@ Minoru Akagi <akagi...@gmail.com> 2013-0 +@@ -40957,7 +40957,7 @@ Minoru Akagi <akagi...@gmail.com> 2013-0 Salvatore Larosa <lrssv...@gmail.com> 2013-04-22 @@ -126,7 +126,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 nyalldawson <nyall.daw...@gmail.com> 2013-04-22 -@@ -40079,7 +40079,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 +@@ -41030,7 +41030,7 @@ Salvatore Larosa <lrssv...@gmail.com> 20 Salvatore Larosa <lrssv...@gmail.com> 2013-04-17 [pyqgis-console] added a python object browser for editor @@ -135,7 +135,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - minor fixes and cleanup Salvatore Larosa <lrssv...@gmail.com> 2013-04-20 -@@ -40202,7 +40202,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -41153,7 +41153,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 * QgsVectorLayerCache did sometimes cache features which did not contain all information which needs to be cached and therefore corrupting the cache and leading to incomplete cache hits. * Add a unit test for the cache problem * Fix QgsCacheIndexFeatureId @@ -144,7 +144,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 D'Hont René-Luc <rldh...@gmail.com> 2013-04-19 -@@ -41263,7 +41263,7 @@ Alexander Bruy <alexander.b...@gmail.com +@@ -42214,7 +42214,7 @@ Alexander Bruy <alexander.b...@gmail.com Alexander Bruy <alexander.b...@gmail.com> 2013-04-11 @@ -153,7 +153,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 4e5c660823) Alexander Bruy <alexander.b...@gmail.com> 2013-04-11 -@@ -42488,7 +42488,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 +@@ -43439,7 +43439,7 @@ Matthias Kuhn <matthias.k...@gmx.ch> 201 Matthias Kuhn <matthias.k...@gmx.ch> 2013-01-28 Add a select by expression dialog. @@ -162,7 +162,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 * Select (clear and select) * Add to selection * Remove from selection -@@ -45218,7 +45218,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- +@@ -46169,7 +46169,7 @@ Juergen E. Fischer <j...@norbit.de> 2013- olivierdalang <olivier.dal...@gmail.com> 2013-01-29 [feature] added draw background checkbox in composer items @@ -171,7 +171,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2013-01-26 -@@ -47615,7 +47615,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -48566,7 +48566,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2012-12-05 @@ -180,7 +180,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Alexander Bruy <alexander.b...@gmail.com> 2012-12-05 -@@ -48384,7 +48384,7 @@ Etienne Tourigny <etourigny....@gmail.co +@@ -49335,7 +49335,7 @@ Etienne Tourigny <etourigny....@gmail.co Etienne Tourigny <etourigny....@gmail.com> 2012-10-07 @@ -189,7 +189,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Etienne Tourigny <etourigny....@gmail.com> 2012-09-22 -@@ -50641,7 +50641,7 @@ Arunmozhi <arunthe...@gmail.com> 2012-10 +@@ -51592,7 +51592,7 @@ Arunmozhi <arunthe...@gmail.com> 2012-10 Giuseppe Sucameli <brush.ty...@gmail.com> 2012-10-07 python console: fix key events and text selection, @@ -198,7 +198,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 cleanup (remove unused functions and vars) Giuseppe Sucameli <brush.ty...@gmail.com> 2012-10-07 -@@ -52856,7 +52856,7 @@ Etienne Tourigny <etourigny....@gmail.co +@@ -53807,7 +53807,7 @@ Etienne Tourigny <etourigny....@gmail.co Etienne Tourigny <etourigny....@gmail.com> 2012-09-10 @@ -207,7 +207,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2012-09-10 -@@ -54505,7 +54505,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -55456,7 +55456,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Juergen E. Fischer <j...@norbit.de> 2012-08-16 @@ -216,7 +216,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Larry Shaffer <lar...@dakotacarto.com> 2012-08-16 -@@ -59808,7 +59808,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -60759,7 +60759,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- wmts fixes: - [FEATURE] add support for CRS:27 and CRS:83 in QgsCoordinateReferenceSystem - fix axis orientation for CRS:84 @@ -225,7 +225,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 - fix: only consider valid TileMatrixSetLimits Juergen E. Fischer <j...@norbit.de> 2012-05-16 -@@ -62863,7 +62863,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -63814,7 +63814,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Etienne Tourigny <etourigny....@gmail.com> 2012-03-08 @@ -234,7 +234,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-03-09 -@@ -63007,7 +63007,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -63958,7 +63958,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Alexander Bruy <alexander.b...@gmail.com> 2012-03-06 @@ -243,7 +243,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 for individual features too Juergen E. Fischer <j...@norbit.de> 2012-03-06 -@@ -63236,7 +63236,7 @@ Marco Hugentobler <marco.hugentobler@sou +@@ -64187,7 +64187,7 @@ Marco Hugentobler <marco.hugentobler@sou Juergen E. Fischer <j...@norbit.de> 2012-02-23 @@ -252,7 +252,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-02-23 -@@ -63590,7 +63590,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- +@@ -64541,7 +64541,7 @@ Juergen E. Fischer <j...@norbit.de> 2012- Giuseppe Sucameli <brush.ty...@gmail.com> 2012-02-11 @@ -261,7 +261,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-02-11 -@@ -64557,7 +64557,7 @@ Nathan Woodrow <woodrow.nat...@gmail.com +@@ -65508,7 +65508,7 @@ Nathan Woodrow <woodrow.nat...@gmail.com Juergen E. Fischer <j...@norbit.de> 2012-01-17 @@ -270,7 +270,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Juergen E. Fischer <j...@norbit.de> 2012-01-17 -@@ -66142,7 +66142,7 @@ Martin Dobias <wonder...@gmail.com> 2011 +@@ -67093,7 +67093,7 @@ Martin Dobias <wonder...@gmail.com> 2011 Juergen E. Fischer <j...@norbit.de> 2011-11-30 @@ -279,7 +279,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 force usage of the attribute table memory model. Apparently the memory model was completely disfunctional before. Fixes included, but it probably needs more testing. -@@ -68227,7 +68227,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -69178,7 +69178,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 @@ -288,7 +288,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 -@@ -68324,7 +68324,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com +@@ -69275,7 +69275,7 @@ Giuseppe Sucameli <brush.ty...@gmail.com Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 @@ -297,7 +297,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 Giuseppe Sucameli <brush.ty...@gmail.com> 2011-08-18 -@@ -94898,7 +94898,7 @@ macho <macho@c8812cc2-4d05-0410-92ff-de0 +@@ -95849,7 +95849,7 @@ macho <macho@c8812cc2-4d05-0410-92ff-de0 gcontreras <gcontreras@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2009-08-21 @@ -306,7 +306,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 git-svn-id: http://svn.osgeo.org/qgis/trunk@11460 c8812cc2-4d05-0410-92ff-de0c093fc19c -@@ -103965,7 +103965,7 @@ telwertowski <telwertowski@c8812cc2-4d05 +@@ -104916,7 +104916,7 @@ telwertowski <telwertowski@c8812cc2-4d05 timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-08-30 @@ -315,7 +315,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 git-svn-id: http://svn.osgeo.org/qgis/trunk@9222 c8812cc2-4d05-0410-92ff-de0c093fc19c -@@ -120994,7 +120994,7 @@ g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0 +@@ -121945,7 +121945,7 @@ g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0 mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c> 2006-08-18 @@ -381,7 +381,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 <message> --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts -@@ -20614,7 +20614,7 @@ Bitte versuchen Sie eine niedrigere Aufl +@@ -20610,7 +20610,7 @@ Bitte versuchen Sie eine niedrigere Aufl <translation>Gleiche Spaltenbreite</translation> </message> <message> @@ -403,7 +403,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 <message> --- a/i18n/qgis_en.ts +++ b/i18n/qgis_en.ts -@@ -20632,8 +20632,8 @@ Please try a lower resolution or a small +@@ -20668,8 +20668,8 @@ Please try a lower resolution or a small <translation>Equal column widths</translation> </message> <message> @@ -559,7 +559,7 @@ Applied-Upstream: https://github.com/qgis/QGIS/commit/98c0771b1a4364889470b05ea1 <message> --- a/i18n/qgis_ja.ts +++ b/i18n/qgis_ja.ts -@@ -20259,7 +20259,7 @@ Please try a lower resolution or a small +@@ -20603,7 +20603,7 @@ Please try a lower resolution or a small <translation>列を等幅で作成</translation> </message> <message> diff --git a/debian/patches/developersmap-use-debian-package.patch b/debian/patches/developersmap-use-debian-package.patch index ccae465..f075951 100644 --- a/debian/patches/developersmap-use-debian-package.patch +++ b/debian/patches/developersmap-use-debian-package.patch @@ -4,16 +4,17 @@ Forwarded: not-needed --- a/doc/developersmap.html +++ b/doc/developersmap.html -@@ -1,12 +1,12 @@ - <html> +@@ -3,13 +3,13 @@ <head> -- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css" /> + <title>Developers Map</title> + <meta charset="UTF-8"> +- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" /> + <link rel="stylesheet" href="leaflet/leaflet.css" /> <style type="text/css"> body { padding: 0; margin: 0; } html, body, #developers-map { height: 100%; } </style> -- <script src="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.js"></script> +- <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script> - <script src="http://code.jquery.com/jquery-2.1.0.min.js"></script> + <script src="leaflet/leaflet.js"></script> + <script src="jquery.js"></script> diff --git a/debian/patches/series b/debian/patches/series index 9ecb18e..42ae00f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ developersmap-use-debian-package.patch exclude-dxf2shp-plugin.patch exclude-elvensword-resources.patch 0001-fix-arm-build.patch -0001-adopt-new-spatialite-initialization-scheme-via-thin-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel