This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qlandkartegt.
commit 3c81517e01d107d20d422889e4840be9d08aba3f
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Thu Feb 12 20:55:18 2015 +0100
Refresh patches.
---
debian/patches/01-no-updates-check.patch | 10 ++--
.../patches/02-restore_mapnik_and_user_agent.patch | 58 ++++++++--------------
debian/patches/03-set_user_agent.patch | 58 ++++++++--------------
3 files changed, 46 insertions(+), 80 deletions(-)
diff --git a/debian/patches/01-no-updates-check.patch
b/debian/patches/01-no-updates-check.patch
index 4a02358..e83ae2b 100644
--- a/debian/patches/01-no-updates-check.patch
+++ b/debian/patches/01-no-updates-check.patch
@@ -1,13 +1,11 @@
Description: Disable update check
Author: Christoph Biedl <debian.packages.h...@manchmal.in-ulm.de>
-Forwarded: No
-Last-Update: 2014-02-17
+Forwarded: not-needed
+Last-Update: 2015-02-12
Bug-Debian: https://bugs.debian.org/687030
-Index: qlandkartegt/src/CMainWindow.cpp
-===================================================================
---- qlandkartegt.orig/src/CMainWindow.cpp
-+++ qlandkartegt/src/CMainWindow.cpp
+--- a/src/CMainWindow.cpp
++++ b/src/CMainWindow.cpp
@@ -1565,7 +1565,7 @@ void CMainWindow::slotDownload()
void CMainWindow::slotUpdate()
{
diff --git a/debian/patches/02-restore_mapnik_and_user_agent.patch
b/debian/patches/02-restore_mapnik_and_user_agent.patch
index e13ae4b..67071a6 100644
--- a/debian/patches/02-restore_mapnik_and_user_agent.patch
+++ b/debian/patches/02-restore_mapnik_and_user_agent.patch
@@ -4,14 +4,12 @@ Description: Revert upstream commit r3867
remove user-agent info from web requests
remove built-in mapnik osm server
Author: Christoph Biedl <debian.packages.h...@manchmal.in-ulm.de>
-Forwarded: No
+Forwarded: no
Last-Update: 2014-02-17
Bug-Debian: https://bugs.debian.org/736550
-Index: qlandkartegt/src/CDlgEditWpt.cpp
-===================================================================
---- qlandkartegt.orig/src/CDlgEditWpt.cpp
-+++ qlandkartegt/src/CDlgEditWpt.cpp
+--- a/src/CDlgEditWpt.cpp
++++ b/src/CDlgEditWpt.cpp
@@ -670,7 +670,7 @@ void CDlgEditWpt::triggerSpoilerDownload
pendingRequests.clear();
@@ -21,7 +19,7 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(wpt.link);
networkAccessManager->get(request);
}
-@@ -736,7 +736,7 @@ void CDlgEditWpt::slotRequestFinished(QN
+@@ -755,7 +755,7 @@ void CDlgEditWpt::slotRequestFinished(QN
QString url = re0.cap(1);
QNetworkRequest request;
@@ -30,7 +28,7 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(url);
networkAccessManager->get(request);
return;
-@@ -756,7 +756,7 @@ void CDlgEditWpt::slotRequestFinished(QN
+@@ -775,7 +775,7 @@ void CDlgEditWpt::slotRequestFinished(QN
QString text = re2.cap(2);
QNetworkRequest request;
@@ -39,10 +37,8 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(url);
pendingRequests[networkAccessManager->get(request)] = text;
-Index: qlandkartegt/src/CDlgMapWmsConfig.cpp
-===================================================================
---- qlandkartegt.orig/src/CDlgMapWmsConfig.cpp
-+++ qlandkartegt/src/CDlgMapWmsConfig.cpp
+--- a/src/CDlgMapWmsConfig.cpp
++++ b/src/CDlgMapWmsConfig.cpp
@@ -150,7 +150,7 @@ CDlgMapWmsConfig::CDlgMapWmsConfig(CMapW
this, SLOT(slotProxyAuthenticationRequired(const QNetworkProxy&,
QAuthenticator*)));
@@ -52,10 +48,8 @@ Index: qlandkartegt/src/CDlgMapWmsConfig.cpp
QUrl url(map.urlstr);
#ifdef QK_QT5_PORT
QUrlQuery urlQuery;
-Index: qlandkartegt/src/CMapDB.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapDB.cpp
-+++ qlandkartegt/src/CMapDB.cpp
+--- a/src/CMapDB.cpp
++++ b/src/CMapDB.cpp
@@ -128,6 +128,23 @@ CMapDB::CMapDB(QTabWidget * tb, QObject
{
map_t m;
@@ -89,10 +83,8 @@ Index: qlandkartegt/src/CMapDB.cpp
cfg.setValue("maps/visibleMaps","");
cfg.sync();
-Index: qlandkartegt/src/CMapTms.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapTms.cpp
-+++ qlandkartegt/src/CMapTms.cpp
+--- a/src/CMapTms.cpp
++++ b/src/CMapTms.cpp
@@ -607,7 +607,7 @@ void CMapTms::checkQueue()
}
@@ -102,10 +94,8 @@ Index: qlandkartegt/src/CMapTms.cpp
request.setUrl(req.url);
foreach(const rawHeaderItem_t& item, rawHeaderItems)
{
-Index: qlandkartegt/src/CMapWms.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapWms.cpp
-+++ qlandkartegt/src/CMapWms.cpp
+--- a/src/CMapWms.cpp
++++ b/src/CMapWms.cpp
@@ -637,7 +637,7 @@ void CMapWms::checkQueue()
}
@@ -124,11 +114,9 @@ Index: qlandkartegt/src/CMapWms.cpp
request.setUrl(url);
req.reply = accessManager->get(request);
-Index: qlandkartegt/src/CRouteToolWidget.cpp
-===================================================================
---- qlandkartegt.orig/src/CRouteToolWidget.cpp
-+++ qlandkartegt/src/CRouteToolWidget.cpp
-@@ -502,7 +502,7 @@ void CRouteToolWidget::startOpenRouteSer
+--- a/src/CRouteToolWidget.cpp
++++ b/src/CRouteToolWidget.cpp
+@@ -524,7 +524,7 @@ void CRouteToolWidget::startOpenRouteSer
url.setPath("/qlandkarte/route");
QNetworkRequest request;
@@ -137,7 +125,7 @@ Index: qlandkartegt/src/CRouteToolWidget.cpp
request.setUrl(url);
QNetworkReply* reply = m_networkAccessManager->post(request, array);
-@@ -941,7 +941,7 @@ void CRouteToolWidget::startMapQuest(CRo
+@@ -972,7 +972,7 @@ void CRouteToolWidget::startMapQuest(CRo
// qDebug() << url.toString();
QNetworkRequest request;
@@ -146,10 +134,8 @@ Index: qlandkartegt/src/CRouteToolWidget.cpp
request.setUrl(url);
m_networkAccessManager->get(request);
-Index: qlandkartegt/src/CSearchDB.cpp
-===================================================================
---- qlandkartegt.orig/src/CSearchDB.cpp
-+++ qlandkartegt/src/CSearchDB.cpp
+--- a/src/CSearchDB.cpp
++++ b/src/CSearchDB.cpp
@@ -100,7 +100,7 @@ void CSearchDB::startGoogle(const QStrin
url.addQueryItem("sensor","false");
#endif
@@ -168,10 +154,8 @@ Index: qlandkartegt/src/CSearchDB.cpp
request.setUrl(url);
QNetworkReply * reply = networkAccessManager.post(request, array);
pendingRequests[reply] = eOpenRouteService;
-Index: qlandkartegt/src/CTrack.cpp
-===================================================================
---- qlandkartegt.orig/src/CTrack.cpp
-+++ qlandkartegt/src/CTrack.cpp
+--- a/src/CTrack.cpp
++++ b/src/CTrack.cpp
@@ -1025,7 +1025,7 @@ void CTrack::replaceElevationByRemote(bo
#endif
diff --git a/debian/patches/03-set_user_agent.patch
b/debian/patches/03-set_user_agent.patch
index 5942c81..3e7464c 100644
--- a/debian/patches/03-set_user_agent.patch
+++ b/debian/patches/03-set_user_agent.patch
@@ -1,13 +1,11 @@
Description: Set a mapnik-compliant User-Agent header
Author: Christoph Biedl <debian.packages.h...@manchmal.in-ulm.de>
-Forwarded: No
+Forwarded: no
Last-Update: 2014-02-17
Bug-Debian: https://bugs.debian.org/736550
-Index: qlandkartegt/src/CDlgEditWpt.cpp
-===================================================================
---- qlandkartegt.orig/src/CDlgEditWpt.cpp
-+++ qlandkartegt/src/CDlgEditWpt.cpp
+--- a/src/CDlgEditWpt.cpp
++++ b/src/CDlgEditWpt.cpp
@@ -27,6 +27,7 @@
#include "IMap.h"
#include "IUnit.h"
@@ -25,7 +23,7 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(wpt.link);
networkAccessManager->get(request);
}
-@@ -736,7 +737,7 @@ void CDlgEditWpt::slotRequestFinished(QN
+@@ -755,7 +756,7 @@ void CDlgEditWpt::slotRequestFinished(QN
QString url = re0.cap(1);
QNetworkRequest request;
@@ -34,7 +32,7 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(url);
networkAccessManager->get(request);
return;
-@@ -756,7 +757,7 @@ void CDlgEditWpt::slotRequestFinished(QN
+@@ -775,7 +776,7 @@ void CDlgEditWpt::slotRequestFinished(QN
QString text = re2.cap(2);
QNetworkRequest request;
@@ -43,10 +41,8 @@ Index: qlandkartegt/src/CDlgEditWpt.cpp
request.setUrl(url);
pendingRequests[networkAccessManager->get(request)] = text;
-Index: qlandkartegt/src/CDlgMapWmsConfig.cpp
-===================================================================
---- qlandkartegt.orig/src/CDlgMapWmsConfig.cpp
-+++ qlandkartegt/src/CDlgMapWmsConfig.cpp
+--- a/src/CDlgMapWmsConfig.cpp
++++ b/src/CDlgMapWmsConfig.cpp
@@ -21,6 +21,7 @@
#include "CMapDB.h"
#include "CResources.h"
@@ -64,10 +60,8 @@ Index: qlandkartegt/src/CDlgMapWmsConfig.cpp
QUrl url(map.urlstr);
#ifdef QK_QT5_PORT
QUrlQuery urlQuery;
-Index: qlandkartegt/src/CMapWms.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapWms.cpp
-+++ qlandkartegt/src/CMapWms.cpp
+--- a/src/CMapWms.cpp
++++ b/src/CMapWms.cpp
@@ -24,6 +24,7 @@
#include "CDlgMapWmsConfig.h"
#include "CMapSelectionRaster.h"
@@ -94,11 +88,9 @@ Index: qlandkartegt/src/CMapWms.cpp
request.setUrl(url);
req.reply = accessManager->get(request);
-Index: qlandkartegt/src/CRouteToolWidget.cpp
-===================================================================
---- qlandkartegt.orig/src/CRouteToolWidget.cpp
-+++ qlandkartegt/src/CRouteToolWidget.cpp
-@@ -502,7 +502,7 @@ void CRouteToolWidget::startOpenRouteSer
+--- a/src/CRouteToolWidget.cpp
++++ b/src/CRouteToolWidget.cpp
+@@ -524,7 +524,7 @@ void CRouteToolWidget::startOpenRouteSer
url.setPath("/qlandkarte/route");
QNetworkRequest request;
@@ -107,7 +99,7 @@ Index: qlandkartegt/src/CRouteToolWidget.cpp
request.setUrl(url);
QNetworkReply* reply = m_networkAccessManager->post(request, array);
-@@ -941,7 +941,7 @@ void CRouteToolWidget::startMapQuest(CRo
+@@ -972,7 +972,7 @@ void CRouteToolWidget::startMapQuest(CRo
// qDebug() << url.toString();
QNetworkRequest request;
@@ -116,10 +108,8 @@ Index: qlandkartegt/src/CRouteToolWidget.cpp
request.setUrl(url);
m_networkAccessManager->get(request);
-Index: qlandkartegt/src/CSearchDB.cpp
-===================================================================
---- qlandkartegt.orig/src/CSearchDB.cpp
-+++ qlandkartegt/src/CSearchDB.cpp
+--- a/src/CSearchDB.cpp
++++ b/src/CSearchDB.cpp
@@ -23,6 +23,7 @@
#include "CCanvas.h"
#include "CMapDB.h"
@@ -146,10 +136,8 @@ Index: qlandkartegt/src/CSearchDB.cpp
request.setUrl(url);
QNetworkReply * reply = networkAccessManager.post(request, array);
pendingRequests[reply] = eOpenRouteService;
-Index: qlandkartegt/src/CTrack.cpp
-===================================================================
---- qlandkartegt.orig/src/CTrack.cpp
-+++ qlandkartegt/src/CTrack.cpp
+--- a/src/CTrack.cpp
++++ b/src/CTrack.cpp
@@ -26,6 +26,7 @@
#include "CWptDB.h"
#include "CTrackDB.h"
@@ -167,10 +155,8 @@ Index: qlandkartegt/src/CTrack.cpp
request.setUrl(url);
QNetworkReply * reply = networkAccessManager->get(request);
-Index: qlandkartegt/src/CMapTms.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapTms.cpp
-+++ qlandkartegt/src/CMapTms.cpp
+--- a/src/CMapTms.cpp
++++ b/src/CMapTms.cpp
@@ -26,6 +26,7 @@
#include "CDlgMapTmsConfig.h"
#include "CMapSelectionRaster.h"
@@ -188,10 +174,8 @@ Index: qlandkartegt/src/CMapTms.cpp
request.setUrl(req.url);
foreach(const rawHeaderItem_t& item, rawHeaderItems)
{
-Index: qlandkartegt/src/CMapDB.cpp
-===================================================================
---- qlandkartegt.orig/src/CMapDB.cpp
-+++ qlandkartegt/src/CMapDB.cpp
+--- a/src/CMapDB.cpp
++++ b/src/CMapDB.cpp
@@ -173,7 +173,7 @@ CMapDB::CMapDB(QTabWidget * tb, QObject
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qlandkartegt.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
