Merge branch 'hibby-twists' into hibbian/latest

debian/changelog

@@ -9,7 +9,7 @@ uronode (2.15-3) unstable; urgency=medium
   * Patching mheardd.dat location
     - this should fix jh and jl functionality
 
- -- Dave Hibberd <d@vehibberd.com>  Sun, 21 Jan 2024 19:14:23 +0000
+ -- Dave Hibberd <d@vehibberd.com>  Tue, 12 Sep 2023 22:37:21 +0100
 
 uronode (2.15-2) unstable; urgency=medium
 

debian/patches/non-interactive-install.patch

@@ -16,3 +16,13 @@ Last-Update: 2018-02-10
  _sleep()
  {
    [ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
+@@ -122,6 +116,9 @@
+ 	if [ $? -ne 1 ]
+ 	then
+ 		HAVEAX25="#define HAVE_AX25	1"
++		#These have been moved out of tcp-ip so I have an MOTD when I don't build telnet in
++		HAVEMOTD="#define HAVEMOTD"
++		MOTDPATH='"/etc/ax25/uronode.motd"'
+ 	fi
+ 	#
+ #        echo -n "Include support for the FlexNet protocol ? [Y/n]: "; read answer

debian/patches/series

@@ -1,6 +1,5 @@
 netrom-motd.patch
 non-interactive-install.patch
-zlib-ifdef.patch
 hardening
 folder-update
 install-dir-creation

debian/rules

@@ -6,6 +6,11 @@ export NON_INTERACTIVE=1
 %:
 	dh $@
 
+# Remove things we aren't using in oarc. mheard is a bug awaiting a fix.
+
+override_dh_auto_configure:
+	dh_auto_configure -- --without-flexnet --without-tcpip --without-rose --without-autorouter
+
 # Collapse upstream changes file into single file
 
 override_dh_auto_build: