[SCM] libkgeomap packaging branch, master, updated. debian/15.12.0-1-9-g77a759c

Mon May 30 08:45:32 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=4ff9398

The following commit has been merged in the master branch:
commit 4ff9398d46bec73d18022f83be4642fbeb24731a
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 05:48:13 2016 +0200

    Refresh patches
---
 debian/patches/test_data_dir.patch  | 29 -----------------------------
 debian/patches/use_local_openlayers | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/debian/patches/test_data_dir.patch b/debian/patches/test_data_dir.patch
deleted file mode 100644
index f609f65..0000000
--- a/debian/patches/test_data_dir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: libkgeomap/tests/CMakeLists.txt
-===================================================================
---- libkgeomap.orig/tests/CMakeLists.txt	2015-04-23 21:05:46.627670385 +0200
-+++ libkgeomap/tests/CMakeLists.txt	2015-04-24 13:43:49.021982954 +0200
-@@ -10,6 +10,7 @@
- 
-     include(CTest)
-     enable_testing()
-+    add_definitions("-DTEST_DATA='\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"'")
- 
-     # test the primitive datatypes and helper functions
-     set(test_primitives_sources
-Index: libkgeomap/tests/test_tracks.cpp
-===================================================================
---- libkgeomap.orig/tests/test_tracks.cpp	2015-04-23 23:57:43.006997678 +0200
-+++ libkgeomap/tests/test_tracks.cpp	2015-04-24 13:44:44.079776907 +0200
-@@ -47,10 +47,8 @@
-  */
- KUrl GetTestDataDirectory()
- {
--    // any better ideas on how to get the path?
--    const KUrl thisCPPFile(__FILE__);
--    KUrl testDataDir = thisCPPFile.upUrl();
--    testDataDir.addPath("data/");
-+    KUrl testDataDir(TEST_DATA);
-+
-     return testDataDir;
- }
- 
diff --git a/debian/patches/use_local_openlayers b/debian/patches/use_local_openlayers
index 10e579e..677b5c9 100644
--- a/debian/patches/use_local_openlayers
+++ b/debian/patches/use_local_openlayers
@@ -1,7 +1,16 @@
-Index: libkgeomap/data/backend-osm.html
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 05:48:11 +0200
+Subject: use_local_openlayers
+
 ===================================================================
---- libkgeomap.orig/data/backend-osm.html	2015-05-27 17:42:54.108132161 +0200
-+++ libkgeomap/data/backend-osm.html	2015-05-27 17:52:20.841047631 +0200
+---
+ data/backend-osm.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/backend-osm.html b/data/backend-osm.html
+index cdbe586..a9fd1dd 100644
+--- a/data/backend-osm.html
++++ b/data/backend-osm.html
 @@ -1,6 +1,6 @@
  <html>
  <head>

-- 
libkgeomap packaging

