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 From 2995bda7a82447c80b3954c42305dba55288209f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 26 Apr 2021 21:56:38 +0200 Subject: Declare compliance with Debian Policy 4.5.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c45edbe..55b0600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium * New upstream release: - Rebase patches. - Fix debain/not-installed. + * Declare compliance with Debian Policy 4.5.1 (No changes needed). -- Jörg Frings-Fürst Mon, 26 Apr 2021 20:35:29 +0200 diff --git a/debian/control b/debian/control index 784f139..c7fb0e0 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: libqt5sql5-sqlite, qtbase5-dev, qttools5-dev-tools -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Rules-Requires-Root: no Homepage: http://uriparser.sourceforge.net Vcs-Git: git://jff.email/opt/git/uriparser.git -- cgit v1.2.3 From fd1e8877118506926307d03d809577382ea69b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 26 Apr 2021 22:07:11 +0200 Subject: Remove Build-Depend dh-exec --- debian/changelog | 2 ++ debian/control | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 55b0600..b03e027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium - Rebase patches. - Fix debain/not-installed. * Declare compliance with Debian Policy 4.5.1 (No changes needed). + * debian/control: + - Remove Build-Depend dh-exec. -- Jörg Frings-Fürst Mon, 26 Apr 2021 20:35:29 +0200 diff --git a/debian/control b/debian/control index c7fb0e0..91266e1 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Build-Depends: cmake, debhelper-compat (= 13), - dh-exec (>=0.3), doxygen, graphviz, libgtest-dev, -- cgit v1.2.3 From ba3189dc4b7b8eb91794b8ad5b3d7fbce8e7965c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 26 Apr 2021 22:09:04 +0200 Subject: d/copyright: Add year 2021 to myself --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b03e027..38d91af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.5.1 (No changes needed). * debian/control: - Remove Build-Depend dh-exec. + * debian/copyright: + - Add year 2021 to myself. -- Jörg Frings-Fürst Mon, 26 Apr 2021 20:35:29 +0200 diff --git a/debian/copyright b/debian/copyright index 7af6cb0..125ce98 100644 --- a/debian/copyright +++ b/debian/copyright @@ -20,7 +20,7 @@ Copyright: 2014-2015 Sebastian Pipping License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2020 Jörg Frings-Fürst +Copyright: 2014-2021 Jörg Frings-Fürst License: GPL-3+ License: BSD-3-clause -- cgit v1.2.3 From 02179e607b61eccf0fd6580c67f467f6d669005c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 26 Apr 2021 22:19:54 +0200 Subject: d/changelog: Change distribution to experimental, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 38d91af..3cb9c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium +uriparser (0.9.5+dfsg-1) experimental; urgency=medium * New upstream release: - Rebase patches. @@ -9,7 +9,7 @@ uriparser (0.9.5+dfsg-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2021 to myself. - -- Jörg Frings-Fürst Mon, 26 Apr 2021 20:35:29 +0200 + -- Jörg Frings-Fürst Mon, 26 Apr 2021 22:19:23 +0200 uriparser (0.9.4+dfsg-1) unstable; urgency=medium -- cgit v1.2.3