From 04000f00b443808e2e90783845aaf419dc7d60a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 21:22:19 +0100 Subject: rewrite d/watch for github --- debian/watch | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/watch b/debian/watch index 74e6e7b..00bf5ff 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,14 @@ -version=3 -http://sf.net/uriparser/uriparser-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +version=4 +#http://sf.net/uriparser/uriparser-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ +# https://github.com/uriparser/uriparser/tags (\d\S+)\.tar\.gz + +#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ +# https://github.com/uriparser/uriparser/tags .*/?(\d{1}\.\d.\d)\.tar\.gz +https://github.com/uriparser/uriparser/releases /uriparser/uriparser/archive/(.+)\.tar\.gz + +#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/-$1\.tar\.gz/ \ +# https://github.com///tags .*/?(\d{1}\.\d.\d)\.tar\.gz + +#opts=filenamemangle=s/.+\/?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ +# https://github.com/uriparser/uriparser/tags .*/?(\d\S+)\.tar\.gz -- cgit v1.2.3 From 0ca227c7ff3be80a64807df27ffe7066cf447e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 22:10:36 +0100 Subject: rewrite d/watch for github --- debian/watch | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/watch b/debian/watch index 00bf5ff..5641bc5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,14 +1,4 @@ version=4 -#http://sf.net/uriparser/uriparser-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ -# https://github.com/uriparser/uriparser/tags (\d\S+)\.tar\.gz - -#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ -# https://github.com/uriparser/uriparser/tags .*/?(\d{1}\.\d.\d)\.tar\.gz -https://github.com/uriparser/uriparser/releases /uriparser/uriparser/archive/(.+)\.tar\.gz - -#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/-$1\.tar\.gz/ \ -# https://github.com///tags .*/?(\d{1}\.\d.\d)\.tar\.gz - -#opts=filenamemangle=s/.+\/?(\d\S+)\.tar\.gz/uriparser-$1\.tar\.gz/ \ -# https://github.com/uriparser/uriparser/tags .*/?(\d\S+)\.tar\.gz +opts=uversionmangle=s/_/./g;s/\.(rc\d*)$/~$1/ \ + 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 7accc6a2acfbfce2e9f4a25bd1a8ef9bfec4783a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 22:34:07 +0100 Subject: Refresh symbols file --- debian/changelog | 7 +++++++ debian/liburiparser1.symbols | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 481bb31..757c772 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +uriparser (0.8.5-1) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh symbols file. + + -- Jörg Frings-Fürst Wed, 21 Mar 2018 22:11:26 +0100 + uriparser (0.8.4-1) unstable; urgency=medium * New upstream release. diff --git a/debian/liburiparser1.symbols b/debian/liburiparser1.symbols index 4e5f406..51a2188 100644 --- a/debian/liburiparser1.symbols +++ b/debian/liburiparser1.symbols @@ -67,8 +67,6 @@ liburiparser.so.1 liburiparser1 #MINVER# uriParseUriW@Base 0.6.0 uriPushToStack@Base 0.6.0 uriRemoveBaseUriA@Base 0.6.0 - uriRemoveBaseUriImplA@Base 0.7.2 - uriRemoveBaseUriImplW@Base 0.7.2 uriRemoveBaseUriW@Base 0.6.0 uriRemoveDotSegmentsA@Base 0.6.0 uriRemoveDotSegmentsAbsoluteA@Base 0.6.4 -- cgit v1.2.3 From abd3d9186a6f0ee15688f91a416aaabc98f129a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 22:40:40 +0100 Subject: Remove trailing whitespaces --- debian/changelog | 6 +++++- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 757c772..3f207f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ uriparser (0.8.5-1) UNRELEASED; urgency=medium * New upstream release. - Refresh symbols file. + * Remove trailing whitespaces: + - debian/changelog + - debian/control + - debian/rules -- Jörg Frings-Fürst Wed, 21 Mar 2018 22:11:26 +0100 @@ -162,7 +166,7 @@ uriparser (0.6.3-1) unstable; urgency=low uriparser (0.6.1-1) unstable; urgency=low - * New upstream version. + * New upstream version. * Add a watch file. diff --git a/debian/control b/debian/control index ec9ae66..bf6fb38 100644 --- a/debian/control +++ b/debian/control @@ -62,5 +62,5 @@ Description: documentation files for uriparser uriparser is a library that parses Uniform Resource Identifiers (URIs), strictly adhering to RFC 3986 where syntax for URIs is defined. URIs are used to identify resources, like http://www.debian.org/ or - urn:isbn:0-395-36341-1. This package provides the documentation + urn:isbn:0-395-36341-1. This package provides the documentation files for uriparser. diff --git a/debian/rules b/debian/rules index 713b782..2df6d7e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ confflags += --build $(DEB_BUILD_GNU_TYPE) ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --host $(DEB_HOST_GNU_TYPE) endif - + ### %: -- cgit v1.2.3 From ad5e91c097bbf1b92a6f825103e06d92bb2e85e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 22:49:56 +0100 Subject: Migrate to debhelper 11 --- debian/changelog | 4 ++++ debian/compat | 2 +- debian/control | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3f207f7..9b9be89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ uriparser (0.8.5-1) UNRELEASED; urgency=medium - debian/changelog - debian/control - debian/rules + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. + - Remove dh-autoreconf from Build-Depends. -- Jörg Frings-Fürst Wed, 21 Mar 2018 22:11:26 +0100 diff --git a/debian/compat b/debian/compat index ec63514..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/control b/debian/control index bf6fb38..2a8b993 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: libs Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 9), - dh-autoreconf, + debhelper (>= 11), dh-exec (>=0.3) Build-Depends-Indep: doxygen, -- cgit v1.2.3 From 9e37b9830a0893ab0f80f5ec1517e150af4356b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Mar 2018 23:01:32 +0100 Subject: Declare compliance with Debian Policy 4.1.3; Change to my new email address --- debian/changelog | 4 ++++ debian/control | 4 ++-- debian/copyright | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9b9be89..4f41e22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ uriparser (0.8.5-1) UNRELEASED; urgency=medium - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. - Remove dh-autoreconf from Build-Depends. + * Declare compliance with Debian Policy 4.1.3 (No changes needed). + * Change to my new email address: + - debian/control + - debian/copyright -- Jörg Frings-Fürst Wed, 21 Mar 2018 22:11:26 +0100 diff --git a/debian/control b/debian/control index 2a8b993..04daf1a 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: uriparser Section: libs Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 11), dh-exec (>=0.3) @@ -11,7 +11,7 @@ Build-Depends-Indep: qttools5-dev-tools, qtbase5-dev, libqt5sql5-sqlite -Standards-Version: 3.9.6 +Standards-Version: 4.1.3 Homepage: http://uriparser.sourceforge.net Vcs-Git: git://anonscm.debian.org/collab-maint/uriparser.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/uriparser.git diff --git a/debian/copyright b/debian/copyright index 5d1d263..086f569 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,7 +19,7 @@ Copyright: 2014-2015 Sebastian Pipping License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2015 Jörg Frings-Fürst +Copyright: 2014-2018 Jörg Frings-Fürst License: GPL-3+ License: BSD-3-clause -- cgit v1.2.3 From f5db3e225f650873b63d3a9078ddfcdf02062ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 22 Mar 2018 07:22:48 +0100 Subject: Refresh debian/copyright; Rewrite debian/upstream/metadata --- debian/changelog | 2 ++ debian/copyright | 4 ++-- debian/upstream/metadata | 9 ++++----- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4f41e22..b13ab27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ uriparser (0.8.5-1) UNRELEASED; urgency=medium * New upstream release. - Refresh symbols file. + - Refresh debian/copyright. + - Rewrite debian/upstream/metadata. * Remove trailing whitespaces: - debian/changelog - debian/control diff --git a/debian/copyright b/debian/copyright index 086f569..5a52f3d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: uriparser -Source: http://uriparser.sourceforge.net +Source: https://github.com/uriparser/uriparser Files: * Copyright: 2007 Weijia Song diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 965e62e..60c70b2 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,6 +1,5 @@ -Bug-Database: http://sourceforge.net/p/uriparser/bugs/ -Bug-Submit: https://sourceforge.net/p/uriparser/bugs/new/ -Contact: https://sourceforge.net/p/uriparser/mailman/uriparser-users +Bug-Database: https://github.com/uriparser/uriparser/issues +Bug-Submit: https://github.com/uriparser/uriparser/issues/new Name: uriparser -Repository: git://git.code.sf.net/p/uriparser/git uriparser-git -Repository-Browse: https://sourceforge.net/p/uriparser/git/ci/master/tree/ +Repository: https://github.com/uriparser/uriparser.git +Repository-Browse: https://github.com/uriparser/uriparser -- cgit v1.2.3 From 52052c161e3230d27658d819be68abd4597aa6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 22 Mar 2018 07:24:59 +0100 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index b13ab27..50132b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ uriparser (0.8.5-1) UNRELEASED; urgency=medium * Change to my new email address: - debian/control - debian/copyright + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Wed, 21 Mar 2018 22:11:26 +0100 -- cgit v1.2.3