Packaging cleanup

* Declare compliance with policy 4.6.2
* Bump debhelper compat level to 13
* Set Rule-Requires-Root: no
* Update debian/watch to version 4
* Various suggestions by lintian

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -1,17 +1,18 @@
 Source: aoetools
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: http://aoetools.sf.net
-Standards-Version: 4.3.0
-Build-Depends: debhelper (>> 10~),
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.in-ulm.de/cbiedl/aoetools
 Vcs-Git: https://git.in-ulm.de/cbiedl/aoetools.git
+Build-Depends: debhelper-compat (= 13),
 Priority: optional
+Rules-Requires-Root: no
 Section: admin
 
 Package: aoetools
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends}, ${shlibs:Depends},
-    lsb-base,
 Description: tools to assist in using ATA over Ethernet
  The aoetools are the client-side programs of the ATA over Ethernet
  (AoE) network storage protocol, a simple protocol for using storage

debian/patches/01_no_bashisms.patch

@@ -1,5 +1,6 @@
 Subject: This patch avois calling directly to /bin/sh.
 Author: David Martínez Moreno <ender@debian.org>
+Forwarded: no
 
 --- a/aoe-mkdevs
 +++ b/aoe-mkdevs

debian/patches/cherry-pick/1434502789.aoetools-36-1-g28817dd.update-resources-in-documentation.patch

@@ -2,6 +2,7 @@ Subject: Update resources in documentation
 Origin: aoetools-36-1-g28817dd <https://github.com/OpenAoE/aoetools/commit/aoetools-36-1-g28817dd>
 Upstream-Author: Ed Cashin <ed.cashin@acm.org>
 Date: Tue Jun 16 20:59:49 2015 -0400
+Forwarded: not-needed (cherry-picked)
 
 --- a/README
 +++ b/README

debian/patches/cherry-pick/1434503415.aoetools-36-2-ge50247f.check-amount-of-data-read-from-network-before-using-it.patch

@@ -2,6 +2,7 @@ Subject: Check amount of data read from network before using it
 Origin: aoetools-36-2-ge50247f <https://github.com/OpenAoE/aoetools/commit/aoetools-36-2-ge50247f>
 Upstream-Author: Ed Cashin <ed.cashin@acm.org>
 Date: Tue Jun 16 21:10:15 2015 -0400
+Forwarded: not-needed (cherry-picked)
 
 --- a/aoeping.c
 +++ b/aoeping.c

debian/patches/cherry-pick/1480936926.aoetools-36-5-gbd9616d.aoe-mkdevs-sh-man-page-typo.patch

@@ -2,6 +2,7 @@ Subject: Aoe-mkdevs.sh: Man page typo
 Origin: aoetools-36-5-gbd9616d <https://github.com/OpenAoE/aoetools/commit/aoetools-36-5-gbd9616d>
 Upstream-Author: Kelvin Lawson <kelvinl@users.sf.net>
 Date: Mon Dec 5 11:22:06 2016 +0000
+Forwarded: not-needed (cherry-picked)
 
 --- a/aoe-mkdevs.8
 +++ b/aoe-mkdevs.8

debian/patches/cherry-pick/1484013170.aoetools-36-7-gf2d2325.avoid-hyphen-vs-minus-issues.patch

@@ -2,6 +2,7 @@ Subject: Avoid hyphen vs minus issues
 Origin: aoetools-36-7-gf2d2325 <https://github.com/OpenAoE/aoetools/commit/aoetools-36-7-gf2d2325>
 Upstream-Author: Ed Cashin <ed.cashin@acm.org>
 Date: Mon Jan 9 20:52:50 2017 -0500
+Forwarded: not-needed (cherry-picked)
 
     ender@debian.org submitted these changes to the man pages, so
     that dashes would not by transformed into hyphens.

debian/patches/cherry-pick/1484013334.aoetools-36-8-g9066acb.biedl-fixes-typos-in-documentation.patch

@@ -2,6 +2,7 @@ Subject: Biedl fixes typos in documentation
 Origin: aoetools-36-8-g9066acb <https://github.com/OpenAoE/aoetools/commit/aoetools-36-8-g9066acb>
 Upstream-Author: Ed Cashin <ed.cashin@acm.org>
 Date: Mon Jan 9 20:55:34 2017 -0500
+Forwarded: not-needed (cherry-picked)
 
     Christoph Biedl, the debian package maintainer for aoetools,
     provides these typo corrections.

debian/patches/cherry-pick/1516148912.aoetools-36-9-g4ef4274.change-shell-script-interpreter-from-bin-bash-to-bin-sh.patch

@@ -2,6 +2,7 @@ Subject: Change shell script interpreter from /bin/bash to /bin/sh
 Origin: aoetools-36-9-g4ef4274 <https://github.com/OpenAoE/aoetools/commit/aoetools-36-9-g4ef4274>
 Upstream-Author: Sergio Prado <sergio.prado@e-labworks.com>
 Date: Tue Jan 16 22:28:32 2018 -0200
+Forwarded: not-needed (cherry-picked)
 
     This will make the script more portable, making it possible to run on
     systems that do not have bash.

debian/patches/cherry-pick/1621687045.aoetools-36-11-g4a3ee18.aoe-sancheck-refine-interface-probing.patch

@@ -2,6 +2,7 @@ Subject: Aoe-sancheck: Refine interface probing
 Origin: aoetools-36-11-g4a3ee18 <https://github.com/OpenAoE/aoetools/commit/aoetools-36-11-g4a3ee18>
 Upstream-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: Sat May 22 14:37:25 2021 +0200
+Forwarded: not-needed (cherry-picked)
 
     There are two issues in the ethlist function in aoe-sancheck.c:
 

debian/patches/cherry-pick/1621688081.aoetools-36-12-gc80b1be.aoe-sancheck-raise-the-number-of-interfaces-to-probe-to-32-and-document-the-limit.patch

@@ -2,6 +2,7 @@ Subject: Aoe-sancheck: Raise the number of interfaces to probe to 32, and docume
 Origin: aoetools-36-12-gc80b1be <https://github.com/OpenAoE/aoetools/commit/aoetools-36-12-gc80b1be>
 Upstream-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: Sat May 22 14:54:41 2021 +0200
+Forwarded: not-needed (cherry-picked)
 
 --- a/aoe-sancheck.8
 +++ b/aoe-sancheck.8

debian/rules

@@ -3,11 +3,11 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with systemd
+	dh $@
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 override_dh_installinit:
-	dh_installinit --no-restart-on-upgrade -u"start 41 S . start 34 0 6 ."
-	dh_systemd_enable --name=aoe-discover
+	dh_installinit --no-stop-on-upgrade -u"start 41 S . start 34 0 6 ."
+	dh_installsystemd --name=aoe-discover

debian/watch

@@ -1,2 +1,3 @@
-version=3
-http://sf.net/aoetools/aoetools-(.+)\.tar\.gz
+
+version=4
+http://sf.net/@PACKAGE@/@PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@