13 files changed, 84 insertions, 35 deletions
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/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  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 481bb31..09e7c88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+uriparser (0.8.5-2) unstable; urgency=medium
+
+  * debian/control:
+    - Switch Vcs-* to new loacation.
+  * Remove now useless debian/liburiparser-doc.lintian-overrides.
+  * Declare compliance with Debian Policy 4.1.5 (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 08 Jul 2018 14:16:31 +0200
+
+uriparser (0.8.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix broken symlink: liburiparser.so -> liburiparser.so.1.0.21
+    (closes: #901955)
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 22 Jun 2018 17:00:15 +0200
+
+uriparser (0.8.5-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #893316).
+    - Refresh symbols file.
+    - Refresh debian/copyright.
+    - Rewrite debian/upstream/metadata.
+  * Remove trailing whitespaces:
+    - 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.
+  * Declare compliance with Debian Policy 4.1.4 (No changes needed).
+  * Change to my new email address:
+    - debian/control
+    - debian/copyright
+  * New README.source to explain the branching model used.
+  * debian/rules:
+    - Switch to $(DEB_UPSTREAM_VERSION).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 05 May 2018 10:14:09 +0200
+
 uriparser (0.8.4-1) unstable; urgency=medium
 
   * New upstream release.
@@ -155,7 +196,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/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 ec9ae66..68d11b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
 Source: uriparser
 Section: libs
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
+ debhelper (>= 11),
  dh-exec (>=0.3)
 Build-Depends-Indep:
  doxygen,
@@ -12,10 +11,10 @@ Build-Depends-Indep:
  qttools5-dev-tools,
  qtbase5-dev,
  libqt5sql5-sqlite
-Standards-Version: 3.9.6
+Standards-Version: 4.1.5
 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
+Vcs-Git: git://jff.email/opt/git/uriparser.git
+Vcs-Browser: https://jff.email/cgit/uriparser.git
 
 Package: liburiparser1
 Architecture: any
@@ -62,5 +61,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/copyright b/debian/copyright
index 5d1d263..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 <songweijia@gmail.com>
@@ -19,7 +19,7 @@ Copyright: 2014-2015 Sebastian Pipping <webmaster@hartwork.org>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: BSD-3-clause
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..bf254b1
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+uriparser_0.8.5-2_source.buildinfo libs optional
diff --git a/debian/liburiparser-dev.install b/debian/liburiparser-dev.install
index 68e5a87..8ea08d4 100644
--- a/debian/liburiparser-dev.install
+++ b/debian/liburiparser-dev.install
@@ -1,2 +1,3 @@
 usr/include
 usr/lib/*/pkgconfig/*
+usr/lib/*/*.so
diff --git a/debian/liburiparser-dev.links b/debian/liburiparser-dev.links
deleted file mode 100755
index 5ec7658..0000000
--- a/debian/liburiparser-dev.links
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-
-usr/lib/${DEB_HOST_MULTIARCH}/liburiparser.so.1.0.20 usr/lib/${DEB_HOST_MULTIARCH}/liburiparser.so
diff --git a/debian/liburiparser-doc.lintian-overrides b/debian/liburiparser-doc.lintian-overrides
deleted file mode 100644
index 3b05f63..0000000
--- a/debian/liburiparser-doc.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# The lintian warning "liburiparser-doc: embedded-javascript-library
-# usr/share/doc/liburiparser-doc/html/jquery.js please use libjs-jquery"
-# was overridden.
-# The file jquery.js comes from the with doxygen-generated documentation.
-# The built-in jquery.js in doxygen is not going to be removed (see Debian bug #736432).
-#
-liburiparser-doc binary: embedded-javascript-library
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
diff --git a/debian/rules b/debian/rules
index 713b782..3245017 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+
 # hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -16,7 +18,7 @@ confflags += --build $(DEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --host $(DEB_HOST_GNU_TYPE)
 endif
-    
+
 ###
 
 %:
@@ -34,10 +36,8 @@ override_dh_installdocs-indep:
 	$(RM) debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/*.md5
 	dh_installdocs
 
-UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev)
-
 override_dh_makeshlibs:
-	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -Pdebian/liburiparser1 -pliburiparser1
+	dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/liburiparser1 -pliburiparser1
 
 override_dh_compress:
 	dh_compress -X.qhp
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
diff --git a/debian/watch b/debian/watch
index 74e6e7b..5641bc5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-http://sf.net/uriparser/uriparser-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+version=4
+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)