From 81295bc356141d7820f07c83e596e057ddc32fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 26 Apr 2021 21:55:19 +0200 Subject: Rebase patches and d/not-installed --- debian/changelog | 8 ++++++++ debian/not-installed | 3 ++- debian/patches/0001-missing_pthread.patch | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b20ced8..c45edbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release: + - Rebase patches. + - Fix debain/not-installed. + + -- Jörg Frings-Fürst Mon, 26 Apr 2021 20:35:29 +0200 + uriparser (0.9.4+dfsg-1) unstable; urgency=medium * New upstream release. diff --git a/debian/not-installed b/debian/not-installed index 3192fd7..e8aa5db 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,4 +1,5 @@ usr/share/doc/uriparser/uriparser-0.9.4.qch usr/share/doc/uriparser/html/* usr/bin/uriparse -usr/lib/*/cmake/uriparser-0.9.4/* +usr/lib/*/cmake/uriparser-0.9.5/* +usr/lib/*/uriparser-0.9.5/uriparser.cmake diff --git a/debian/patches/0001-missing_pthread.patch b/debian/patches/0001-missing_pthread.patch index a7aa3cc..0d6db5a 100644 --- a/debian/patches/0001-missing_pthread.patch +++ b/debian/patches/0001-missing_pthread.patch @@ -7,8 +7,8 @@ Index: trunk/CMakeLists.txt =================================================================== --- trunk.orig/CMakeLists.txt +++ trunk/CMakeLists.txt -@@ -217,7 +217,8 @@ if(URIPARSER_BUILD_TOOLS) - tool/uriparse.c +@@ -229,7 +229,8 @@ if(URIPARSER_BUILD_TOOLS) + ${CMAKE_CURRENT_SOURCE_DIR}/tool/uriparse.c ) - target_link_libraries(uriparse PUBLIC uriparser) @@ -17,15 +17,15 @@ Index: trunk/CMakeLists.txt if(HAIKU) # Function inet_ntop needs -lsocket or -lnetwork (see pull request #45) -@@ -258,6 +259,7 @@ if(URIPARSER_BUILD_TESTS) +@@ -270,6 +271,7 @@ if(URIPARSER_BUILD_TESTS) enable_testing() find_package(GTest 1.8.0 REQUIRED) + find_package(Threads REQUIRED) add_executable(testrunner - test/FourSuite.cpp -@@ -287,7 +289,7 @@ if(URIPARSER_BUILD_TESTS) + ${CMAKE_CURRENT_SOURCE_DIR}/test/FourSuite.cpp +@@ -299,7 +301,7 @@ if(URIPARSER_BUILD_TESTS) ) target_link_libraries(testrunner PUBLIC @@ -33,4 +33,4 @@ Index: trunk/CMakeLists.txt + ${GTEST_BOTH_LIBRARIES} pthread ) - add_test( + # NOTE: uriparser does not use pthreads itself but gtest does -- cgit v1.2.3