This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit a8d3e8110621ea514867e1320573b8a6f51a76ab Author: Bas Couwenberg <[email protected]> Date: Mon Feb 13 18:43:02 2017 +0100 Revert "Add patch to fix "error: 'QStringLiteral' was not declared in this scope"." This reverts commit b7099298c92c455fd4c69a448ffef89ccee2984c. Conflicts: debian/changelog --- debian/changelog | 1 - debian/patches/0001-fix-6e1ec44b.patch | 43 ---------------------------------- debian/patches/series | 1 - 3 files changed, 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82b4cb5..f9839da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ qgis (2.14.11+dfsg-2) UNRELEASED; urgency=medium - * Add patch to fix "error: 'QStringLiteral' was not declared in this scope". * Add Breaks/Replaces on python-qt4 for QtWebKit. (closes: #855048) diff --git a/debian/patches/0001-fix-6e1ec44b.patch b/debian/patches/0001-fix-6e1ec44b.patch deleted file mode 100644 index 9c20d7d..0000000 --- a/debian/patches/0001-fix-6e1ec44b.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2d09b0b257b84ab667b0a9fcab4b7db5bca8a4b6 Mon Sep 17 00:00:00 2001 -From: "Juergen E. Fischer" <[email protected]> -Date: Fri, 13 Jan 2017 15:54:27 +0100 -Subject: fix 6e1ec44b - ---- - src/server/qgsserver.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/src/server/qgsserver.cpp -+++ b/src/server/qgsserver.cpp -@@ -198,18 +198,18 @@ void QgsServer::printRequestParameters( - */ - void QgsServer::printRequestInfos() - { -- QgsMessageLog::logMessage( QStringLiteral( "******************** New request ***************" ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "******************** New request ***************", "Server", QgsMessageLog::INFO ); - if ( getenv( "REMOTE_ADDR" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_HOST" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_USER" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_IDENT" ) ) - { -@@ -241,7 +241,7 @@ void QgsServer::printRequestInfos() - } - if ( getenv( "HTTP_AUTHORIZATION" ) ) - { -- QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), "Server", QgsMessageLog::INFO ); - } - } - diff --git a/debian/patches/series b/debian/patches/series index 9929826..24400d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,4 +8,3 @@ qtermwidget-kfreebsd.patch qtermwidget-hurd.patch qt4-without-qtwebkit.patch columns-typo.patch -0001-fix-6e1ec44b.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
