Merge branch 'upstream'

diff --cc debian/changelog
index e12a4fc12c9bf1fd24662935a841a8f3fc30ae62,0000000000000000000000000000000000000000..111e808f538210b9c1a08f26e5e743a262dbb7c9
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,93 -1,0 +1,99 @@@
++p10cfgd (1.1-1) unstable; urgency=low
++
++  * freshen debhelper compat level, closes: #965761
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 03 Jan 2021 09:59:57 -0700
++
 +p10cfgd (1.0-16) unstable; urgency=low
 +
 +  * actually change dep from perl5 to perl this time, closes: #808233
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed, 30 Dec 2015 09:37:27 -0700
 +
 +p10cfgd (1.0-15) unstable; urgency=low
 +
 +  * change dep from perl5 to perl, closes: #808233
 +
 + -- Bdale Garbee <bdale@gag.com>  Thu, 17 Dec 2015 14:38:26 -0700
 +
 +p10cfgd (1.0-14) unstable; urgency=low
 +
 +  * add Vcs entries to the control file
 +  * move gbp.conf to .git
 +
 + -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 07:13:03 -0600
 +
 +p10cfgd (1.0-13) unstable; urgency=low
 +
 +  * add dependency on update-inetd, closes: #502832
 +
 + -- Bdale Garbee <bdale@gag.com>  Mon, 20 Oct 2008 20:34:10 +0200
 +
 +p10cfgd (1.0-12) unstable; urgency=low
 +
 +  * fresh build resolving policy issues, closes: #359548
 +
 + -- Bdale Garbee <bdale@gag.com>  Sat, 15 Apr 2006 00:44:08 -0600
 +
 +p10cfgd (1.0-11) unstable; urgency=low
 +
 +  * update to current standards, clear lintian report
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue,  1 Jan 2002 10:39:47 -0700
 +
 +p10cfgd (1.0-10) unstable; urgency=low
 +
 +  * update to latest standards, add Build-Depends, move to FHS
 +
 + -- Bdale Garbee <bdale@gag.com>  Fri,  7 Jan 2000 20:32:57 -0700
 +
 +p10cfgd (1.0-9) unstable; urgency=low
 +
 +  * update control file to depend on perl5 instead of perl, per new perl policy
 +
 + -- Bdale Garbee <bdale@gag.com>  Sat, 17 Jul 1999 17:46:21 -0600
 +
 +p10cfgd (1.0-7) unstable; urgency=low
 +
 +  * fixing minor problem with .orig.tar.gz file
 +  * moving to cvs and updating a few details in the process
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 20 Jun 1999 08:02:21 -0600
 +
 +p10cfgd (1.0-6) unstable; urgency=low
 +
 +  * address lintian errors
 +  * move from debstd to debhelper
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue, 10 Feb 1998 00:37:22 -0700
 +
 +p10cfgd (1.0-5) unstable; urgency=low
 +
 +  * Move executable to /usr/sbin, make it executable.  Closes bug 8281.
 +  * Include some 'expect' scripts in examples directory showing how to extract
 +    stats from a Packeten.
 +
 + -- Bdale Garbee <bdale@gag.com>  Sun, 27 Apr 1997 23:47:13 -0600
 +
 +p10cfgd (1.0-4) unstable; urgency=low
 +
 +  * New package format.
 +  * Cosmetic changes to debian control files.
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed, 30 Oct 1996 10:36:17 -0800
 +
 +Mon Apr 22 23:04:22 MDT 1996    Bdale Garbee    <bdale@gag.com>
 +
 +        * fixed architecture to be 'all' and not 'i386', since we're Perl
 +
 +Tue Apr 16 22:40:11 MDT 1996    Bdale Garbee    <bdale@gag.com>
 +
 +        * fixed extended description syntax in debian.control
 +
 +Mon Oct 30 02:40:54 MST 1995    Bdale Garbee    <bdale@gag.com>
 +
 +        * Initial version for Debian.
 +
 +Local variables:
 +mode: debian-changelog
 +End:

diff --cc debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69,0000000000000000000000000000000000000000..b1bd38b62a0800a4f6a80c34e21c5acffae52c7e
mode 100644,000000..100644
--- 1/debian/compat
--- /dev/null
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++13

diff --cc debian/control
index 3d16668a44bec9f8facb0101f36647cddd8ab904,0000000000000000000000000000000000000000..d0edd59f0de3b2bdd6ab83245629667c126f3b17
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,20 -1,0 +1,20 @@@
- Priority: extra
 +Source: p10cfgd
 +Section: hamradio
- Build-Depends: debhelper (>= 5)
- Standards-Version: 3.9.6.1
++Priority: optional
 +Maintainer: Bdale Garbee <bdale@gag.com>
++Build-Depends: debhelper (>= 13)
++Standards-Version: 4.5.1
 +Vcs-Git: git://git.gag.com/debian/p10cfgd
 +Vcs-Browser: https://git.gag.com/?p=debian/p10cfgd
 +
 +Package: p10cfgd
 +Architecture: all
 +Depends: netbase (>=1.23), perl, update-inetd, ${misc:Depends}
 +Description: Remote configuration daemon for Gracilis Packeten
 + The 'p10cfgd' daemon provides support for the 'rmtcfg' command in the 
 + Gracilis Packeten amateur radio network packet switch.  With this daemon,
 + and appropriate entries in the non-volatile configuration memory of a
 + Packeten, it is possible to have the switch load commands and information
 + at boot time.  Further, this daemon appends a command which sets the date
 + and time in the clock on the Packeten.
 +

diff --cc debian/p10cfgd.lintian
index 219568d5b32aaf00fb9550a71da1266d6bfe8d45,0000000000000000000000000000000000000000..5c4bc003e3f723815a5611265c29916fd3e1d7eb
mode 100644,000000..100644
--- 1/debian/p10cfgd.lintian
--- /dev/null
+++ b/debian/p10cfgd.lintian
@@@ -1,1 -1,0 +1,2 @@@
- p10cfgd: manpage-has-errors-from-man usr/share/man/man1/p10cfgd.1.gz 3: warning: `ig00' not defined (probable missing space after `ig')
++p10cfgd: groff-message usr/share/man/man1/p10cfgd.1.gz 168: warning: macro '00' not defined
++p10cfgd: groff-message usr/share/man/man1/p10cfgd.1.gz 173: warning: macro ';' not defined