From ed50178f4e337c898740989a5c2f9ada1c4d5dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 18:59:44 +0200 Subject: Refresh patches --- debian/changelog | 7 +++++++ debian/patches/0001-missing_pthread.patch | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f6ddb7..62e9f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +uriparser (0.9.4-1) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh patch. + + -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 + uriparser (0.9.3-2) unstable; urgency=medium * Fix FTBFS: diff --git a/debian/patches/0001-missing_pthread.patch b/debian/patches/0001-missing_pthread.patch index 1567ac4..a7aa3cc 100644 --- a/debian/patches/0001-missing_pthread.patch +++ b/debian/patches/0001-missing_pthread.patch @@ -7,7 +7,7 @@ Index: trunk/CMakeLists.txt =================================================================== --- trunk.orig/CMakeLists.txt +++ trunk/CMakeLists.txt -@@ -212,7 +212,8 @@ if(URIPARSER_BUILD_TOOLS) +@@ -217,7 +217,8 @@ if(URIPARSER_BUILD_TOOLS) tool/uriparse.c ) @@ -17,15 +17,15 @@ Index: trunk/CMakeLists.txt if(HAIKU) # Function inet_ntop needs -lsocket or -lnetwork (see pull request #45) -@@ -245,6 +246,7 @@ if(URIPARSER_BUILD_TESTS) +@@ -258,6 +259,7 @@ if(URIPARSER_BUILD_TESTS) enable_testing() - find_package(GTest 1.8.1 REQUIRED) + find_package(GTest 1.8.0 REQUIRED) + find_package(Threads REQUIRED) add_executable(testrunner test/FourSuite.cpp -@@ -274,7 +276,7 @@ if(URIPARSER_BUILD_TESTS) +@@ -287,7 +289,7 @@ if(URIPARSER_BUILD_TESTS) ) target_link_libraries(testrunner PUBLIC -- cgit v1.2.3 From 9dc733cad8e585167de0e9ce193c4292ff3451a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:01:15 +0200 Subject: Declare compliance with Debian Policy 4.5.0 --- 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 62e9f43..af77e84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ uriparser (0.9.4-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patch. + * Declare compliance with Debian Policy 4.5.0 (No changes needed). -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/control b/debian/control index efdce3b..48eeef8 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: libqt5sql5-sqlite, qtbase5-dev, qttools5-dev-tools -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Homepage: http://uriparser.sourceforge.net Vcs-Git: git://jff.email/opt/git/uriparser.git Vcs-Browser: https://jff.email/cgit/uriparser.git -- cgit v1.2.3 From b565445db2724f17abb1dc8f5fd69710b7709666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:06:41 +0200 Subject: Migrate to debhelper-compat 13 --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af77e84..3835b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ uriparser (0.9.4-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patch. * Declare compliance with Debian Policy 4.5.0 (No changes needed). + * Migrate to debhelper-compat 13: + - Remove debian/compat. + - Bump minimum debhelper-compat version in debian/control to = 13. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/control b/debian/control index 48eeef8..51a6c70 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: cmake, - debhelper (>= 12), + debhelper-compat (= 13), dh-exec (>=0.3), doxygen, graphviz, -- cgit v1.2.3 From 20b386089ff8f820de85be8862df2140645b2cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:07:10 +0200 Subject: Migrate to debhelper-compat 13 part 2 --- debian/compat | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/compat (limited to 'debian') diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 -- cgit v1.2.3 From 5aff86390f1eca5ce8d38ae3861f5cd829b67940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:23:22 +0200 Subject: New debian/not-installed --- debian/changelog | 2 ++ debian/not-installed | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 debian/not-installed (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3835b5f..976c9dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ uriparser (0.9.4-1) UNRELEASED; urgency=medium * Migrate to debhelper-compat 13: - Remove debian/compat. - Bump minimum debhelper-compat version in debian/control to = 13. + - New debian/not-installed: + + Add all files of dh_missing errors. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..75e8058 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,4 @@ +usr/share/doc/uriparser/uriparser-0.9.4.qch +usr/share/doc/uriparser/html/* +usr/bin/uriparse +usr/lib/x86_64-linux-gnu/cmake/uriparser-0.9.4/* -- cgit v1.2.3 From fd6ec15adf9db366230cec1bb06f02529f9f81e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:30:53 +0200 Subject: Refresh symbols file --- debian/changelog | 1 + debian/liburiparser1.symbols | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 976c9dd..4d3c9d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ uriparser (0.9.4-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patch. + - Refresh symbols file. * Declare compliance with Debian Policy 4.5.0 (No changes needed). * Migrate to debhelper-compat 13: - Remove debian/compat. diff --git a/debian/liburiparser1.symbols b/debian/liburiparser1.symbols index dad3a99..bb222d5 100644 --- a/debian/liburiparser1.symbols +++ b/debian/liburiparser1.symbols @@ -1,4 +1,5 @@ liburiparser.so.1 liburiparser1 #MINVER# +* Build-Depends-Package: liburiparser-dev uriAddBaseUriA@Base 0.6.0 uriAddBaseUriExA@Base 0.8.1 uriAddBaseUriExMmA@Base 0.9.0 @@ -42,6 +43,10 @@ liburiparser.so.1 liburiparser1 #MINVER# uriFreeUriMembersMmA@Base 0.9.0 uriFreeUriMembersMmW@Base 0.9.0 uriFreeUriMembersW@Base 0.6.0 + uriMakeOwnerA@Base 0.9.4 + uriMakeOwnerMmA@Base 0.9.4 + uriMakeOwnerMmW@Base 0.9.4 + uriMakeOwnerW@Base 0.9.4 uriNormalizeSyntaxA@Base 0.6.0 uriNormalizeSyntaxExA@Base 0.6.0 uriNormalizeSyntaxExMmA@Base 0.9.0 -- cgit v1.2.3 From 1d884c6d986a4fe3acf4311919d56e78a0087c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:43:28 +0200 Subject: Add suffix +dfsg to changelog version number to make lintian happy --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d3c9d7..5d67726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -uriparser (0.9.4-1) UNRELEASED; urgency=medium +uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patch. @@ -9,6 +9,7 @@ uriparser (0.9.4-1) UNRELEASED; urgency=medium - Bump minimum debhelper-compat version in debian/control to = 13. - New debian/not-installed: + Add all files of dh_missing errors. + * Add suffix +dfsg to changelog version number to make lintian happy. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 -- cgit v1.2.3 From d8d4e016ddae2ffd1112d60a4f617d3b4fa43cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 19:56:04 +0200 Subject: Add +dsfg staff into debian/watch --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d67726..0700ac9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium - New debian/not-installed: + Add all files of dh_missing errors. * Add suffix +dfsg to changelog version number to make lintian happy. + * Add +dsfg staff into debian/watch. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/watch b/debian/watch index 5641bc5..1cc7882 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=4 -opts=uversionmangle=s/_/./g;s/\.(rc\d*)$/~$1/ \ +opts=dversionmangle=s/\+dfsg(.*)//,repacksuffix=+dfsg,uversionmangle=s/_/./g;s/\.(rc\d*)$/~$1/,compression=xz \ https://github.com/uriparser/uriparser/releases \ .*[^n]/(?:|v|version-|version|release-|r|REL_|rel-|uriparser(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) -- cgit v1.2.3 From 3e73bd2dfe84d2ff55d559555ab4fba9cd78f639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 20:10:13 +0200 Subject: d/control: Add Rules-Requires-Root: no --- debian/changelog | 5 ++++- debian/control | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0700ac9..f8fad98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,10 @@ uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium - New debian/not-installed: + Add all files of dh_missing errors. * Add suffix +dfsg to changelog version number to make lintian happy. - * Add +dsfg staff into debian/watch. + * debian/watch: + - Add +dsfg staff. + * debian/control: + - Add Rules-Requires-Root: no. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/control b/debian/control index 51a6c70..784f139 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: qtbase5-dev, qttools5-dev-tools Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: http://uriparser.sourceforge.net Vcs-Git: git://jff.email/opt/git/uriparser.git Vcs-Browser: https://jff.email/cgit/uriparser.git -- cgit v1.2.3 From e2675572e84a6bcfa07b150e41e73f3470d63cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 20:14:15 +0200 Subject: d/copyright: Add year 2020 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 f8fad98..2c02843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium - Add +dsfg staff. * debian/control: - Add Rules-Requires-Root: no. + * debian/copyright: + - Add year 2020 to myself. -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 diff --git a/debian/copyright b/debian/copyright index 9778c4f..7af6cb0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -20,7 +20,7 @@ Copyright: 2014-2015 Sebastian Pipping License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2019 Jörg Frings-Fürst +Copyright: 2014-2020 Jörg Frings-Fürst License: GPL-3+ License: BSD-3-clause -- cgit v1.2.3 From 6a5c76b6bc5e4b7db3f7037c65d9bdc0059123c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Jun 2020 20:15:39 +0200 Subject: d/changelog: Change distribution to unstable, 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 2c02843..3d65eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium +uriparser (0.9.4+dfsg-1) unstable; urgency=medium * New upstream release. - Refresh patch. @@ -17,7 +17,7 @@ uriparser (0.9.4+dfsg-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2020 to myself. - -- Jörg Frings-Fürst Mon, 01 Jun 2020 18:52:03 +0200 + -- Jörg Frings-Fürst Mon, 01 Jun 2020 20:14:57 +0200 uriparser (0.9.3-2) unstable; urgency=medium -- cgit v1.2.3 From bfe06f7f5d9bf8850dd24d2a6e94c6a72b5e7d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 19:06:22 +0200 Subject: d/not-installed: Remove architecture specific path --- debian/changelog | 2 ++ debian/not-installed | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d65eba..2e35a41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ uriparser (0.9.4+dfsg-1) unstable; urgency=medium - Add Rules-Requires-Root: no. * debian/copyright: - Add year 2020 to myself. + * debian/not-installed: + - Remove architecture specific path. -- Jörg Frings-Fürst Mon, 01 Jun 2020 20:14:57 +0200 diff --git a/debian/not-installed b/debian/not-installed index 75e8058..3192fd7 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,4 +1,4 @@ usr/share/doc/uriparser/uriparser-0.9.4.qch usr/share/doc/uriparser/html/* usr/bin/uriparse -usr/lib/x86_64-linux-gnu/cmake/uriparser-0.9.4/* +usr/lib/*/cmake/uriparser-0.9.4/* -- cgit v1.2.3 From 3ba8f0f1bcc85fc5c4021ab94bc8c72e79a7d8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 19:07:43 +0200 Subject: d/changelog: Change date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2e35a41..300b740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ uriparser (0.9.4+dfsg-1) unstable; urgency=medium * debian/not-installed: - Remove architecture specific path. - -- Jörg Frings-Fürst Mon, 01 Jun 2020 20:14:57 +0200 + -- Jörg Frings-Fürst Sat, 17 Oct 2020 19:06:54 +0200 uriparser (0.9.3-2) unstable; urgency=medium -- cgit v1.2.3 From d959d4ac0cdd3170aaac9b443ddec6c0b38fcef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 19:26:28 +0200 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 300b740..b6f63cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ uriparser (0.9.4+dfsg-1) unstable; urgency=medium + Add all files of dh_missing errors. * Add suffix +dfsg to changelog version number to make lintian happy. * debian/watch: - - Add +dsfg staff. + - Add +dsfg stuff. * debian/control: - Add Rules-Requires-Root: no. * debian/copyright: -- cgit v1.2.3 From e6f80efde97b924c3317ef986832b1cbf73479c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 17 Oct 2020 19:27:16 +0200 Subject: d/changelog: Change date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b6f63cc..b20ced8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ uriparser (0.9.4+dfsg-1) unstable; urgency=medium * debian/not-installed: - Remove architecture specific path. - -- Jörg Frings-Fürst Sat, 17 Oct 2020 19:06:54 +0200 + -- Jörg Frings-Fürst Sat, 17 Oct 2020 19:26:34 +0200 uriparser (0.9.3-2) unstable; urgency=medium -- cgit v1.2.3