Merge branch 'release/debian/3.23-1'debian/3.23-1

8 files changed, 63 insertions, 54 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a62f7b9
--- /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.email>  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 e80a0dd..d0da703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libhx (3.23-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Change to my new email address.
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - debian/control:
+      + Bump minimum debhelper version  to >= 11.
+      + Remove build depends dh-autoreconf.
+   - Remove --with autoreconf from debian/rules.
+  * New README.source to explain the branching model used.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * Remove now useless debian/libhx-dev.postinst.
+  * debian/control:
+    - Change VCS-* to point to the new repository.
+    - Change Priority extra to optional.
+    - Remove not longer necessary XS-Testsuite field.
+  * debian/copyright:
+    - Use secure URI for copyright format.
+    - Refresh years for debian/*.
+  * debian/rules:
+    - Add override_dh_installdocs to correct installation into the
+      right directory.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 06 Sep 2018 19:41:31 +0200
+
 libhx (3.22-1) unstable; urgency=medium
 
   * New maintainer (Closes: #774994).
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 4861756..e22560f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,13 @@
 Source: libhx
-Priority: extra
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Priority: optional
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 9),
- dh-autoreconf
-Standards-Version: 3.9.6
-XS-Testsuite: autopkgtest
+ debhelper (>= 11)
+Standards-Version: 4.2.1
 Section: libs
 Homepage: http://libhx.sourceforge.net/
-Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/libhx.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/libhx.git
+Vcs-Git: git://jff.email/opt/git/libhx.git
+Vcs-Browser: https://jff.email/cgit/libhx.git
 
 Package: libhx28
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index b247482..4aada04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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: libhx
 Source: http://libhx.sourceforge.net/
 
@@ -11,12 +11,12 @@ License: LGPL-2.1+
 
 Files: debian/*
 Copyright: 2007-2014 Bastian Kleineidam <calvin@debian.org>
-           2015      Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2015-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
-Files: debian/patches/hurd-path-max-define
+Files: debian/patches/*
 Copyright: 2009-2014 Bastian Kleineidam <calvin@debian.org>
-           2015      Jörg Frings-Fürst <debianæjff-webhosting.net>
+           2015-2018 Jörg Frings-Fürst <debianæjff.email>
 License: LGPL-2.1+
 
 Files: build-aux/*
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..f9c45fc
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+libhx_3.23-1_source.buildinfo libs optional
diff --git a/debian/libhx-dev.postinst b/debian/libhx-dev.postinst
deleted file mode 100644
index 0c6905d..0000000
--- a/debian/libhx-dev.postinst
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# postinst script for libhx-dev
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ldconfig
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 4f4c5cc..c5a1756 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-static
@@ -18,3 +19,8 @@ override_dh_makeshlibs:
 	dh_makeshlibs
 	dpkg-gensymbols -v$(VERSION) -Pdebian/libhx28 -plibhx28
 	dpkg-gensymbols -v$(VERSION) -Pdebian/libhx-dev -plibhx-dev
+
+override_dh_installdocs:
+	dh_installdocs -i -plibhx-doc --doc-main-package=libhx-doc
+	dh_installdocs -a -plibhx-dev
+	dh_installdocs -a -plibhx28