[mapcode] 03/04: merge 2.5.2

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository mapcode.

commit f8acb303f83f2a9ea7b0cb17608d1bdca1230ecf
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jan 15 15:04:33 2017 +0100

    merge 2.5.2
    
    * refresh debian/patches/build-fixes
    * changelog
    * renamed test dir
---
 debian/changelog           |  6 ++++++
 debian/patches/build-fixes | 24 +++++++++---------------
 debian/rules               |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9e186f..2251001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapcode (2.5.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 15 Jan 2017 15:00:45 +0100
+
 mapcode (2.5.1-2) unstable; urgency=medium
 
   [ Bas Couwenberg ]
diff --git a/debian/patches/build-fixes b/debian/patches/build-fixes
index f3d9b05..be7c666 100644
--- a/debian/patches/build-fixes
+++ b/debian/patches/build-fixes
@@ -8,9 +8,9 @@ Last-Update: 2016-11-02
 
 --- mapcode.orig/CMakeLists.txt
 +++ mapcode/CMakeLists.txt
-@@ -65,11 +65,24 @@ set(SOURCE_FILES_UNITTEST
- set(SOURCE_FILES_UTILITY
-         utility/mapcode.cpp)
+@@ -95,6 +95,11 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ find_library(M_LIB m)
  
 +set(THREADS_PREFER_PTHREAD_FLAG ON)
 +find_package(Threads REQUIRED)
@@ -19,17 +19,11 @@ Last-Update: 2016-11-02
 +
  add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB})
  target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-+target_link_libraries(mapcodelib Threads::Threads)
-+target_link_libraries(mapcodelib ${M_LIB})
+ target_link_libraries(mapcodelib Threads::Threads)
+@@ -110,4 +115,4 @@ target_link_libraries(mapcode LINK_PUBLI
+ target_link_libraries(mapcode LINK_PUBLIC Threads::Threads)
+ target_link_libraries(mapcode LINK_PUBLIC ${M_LIB})
  
- add_executable(unittest ${SOURCE_FILES_UNITTEST})
- target_link_libraries(unittest LINK_PUBLIC mapcodelib)
-+target_link_libraries(unittest LINK_PUBLIC Threads::Threads)
-+target_link_libraries(unittest LINK_PUBLIC ${M_LIB})
- 
- add_executable(mapcode ${SOURCE_FILES_UTILITY})
- target_link_libraries(mapcode LINK_PUBLIC mapcodelib)
-+target_link_libraries(mapcode LINK_PUBLIC Threads::Threads)
-+target_link_libraries(mapcode LINK_PUBLIC ${M_LIB})
-+
+-install(TARGETS mapcode DESTINATION /usr/local/bin)
+\ No newline at end of file
 +install(TARGETS mapcode DESTINATION /usr/bin)
diff --git a/debian/rules b/debian/rules
index 32fb4be..215becc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,5 +20,5 @@
 	dh $@ --parallel -Bobj
 
 override_dh_auto_test:
-	cd unittest && ../obj/unittest
+	cd test && ../obj/unittest
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcode.git