[SCM] libkgeomap packaging branch, master, updated. 619125c46fa9d16b4747bac2a294a7546ed5e937

Maximiliano Curia maxy at moszumanska.debian.org
Sun Jun 14 17:31:57 UTC 2015


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

The following commit has been merged in the master branch:
commit 66b284d2f1b4bf3abae4c5cb8444a9ddbaa2f534
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 24 13:45:53 2015 +0200

    New patch: test_data_dir.patch
---
 debian/changelog                   |  1 +
 debian/patches/series              |  1 +
 debian/patches/test_data_dir.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7a0c0d1..6f3e586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libkgeomap (15.04.0-1~) UNRELEASED; urgency=medium
 
   * Initial release (15.04.0).
+  * New patch: test_data_dir.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 16:28:26 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..427174b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test_data_dir.patch
diff --git a/debian/patches/test_data_dir.patch b/debian/patches/test_data_dir.patch
new file mode 100644
index 0000000..f609f65
--- /dev/null
+++ b/debian/patches/test_data_dir.patch
@@ -0,0 +1,29 @@
+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;
+ }
+ 

-- 
libkgeomap packaging



More information about the pkg-kde-commits mailing list