Hibbian
/
uronode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into hibby-twists

This commit is contained in:
Dave Hibberd 2023-08-08 23:51:14 +01:00
parent 8cb40976e2 1a8d5a3ca9
commit 5af0f2ae41
No known key found for this signature in database
GPG Key ID: 03A1FB7A1904771B
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,11 +1,19 @@
uronode (2.15-1) UNRELEASED; urgency=medium uronode (2.15-2) unstable; urgency=medium
* Add zlib to control and patch in correct ifdef to configure
* Add netrom MOTD patch
* Standards bump to 4.6.2.0
-- Dave Hibberd <d@vehibberd.com> Tue, 08 Aug 2023 21:48:30 +0100
uronode (2.15-1) unstable; urgency=medium
* New upstream version 2.15 * New upstream version 2.15
* Standards bump to 4.6.0.1 * Standards bump to 4.6.0.1
* Multiple definition patch removed * Multiple definition patch removed
- Included upstream - Included upstream
-- Dave Hibberd <d@vehibberd.com> Sat, 05 Feb 2022 11:58:10 +0000 -- Dave Hibberd <d@vehibberd.com> Sat, 05 Nov 2022 17:01:31 +0100
uronode (2.13-2) unstable; urgency=medium uronode (2.13-2) unstable; urgency=medium

2
debian/control vendored
View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org> Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Dave Hibberd <d@vehibberd.com> Uploaders: Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper-compat (= 13), libax25-dev, zlib1g-dev Build-Depends: debhelper-compat (= 13), libax25-dev, zlib1g-dev
Standards-Version: 4.6.0.1 Standards-Version: 4.6.2.0
Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode
Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git
Homepage: https://uronode.sourceforge.net/ Homepage: https://uronode.sourceforge.net/

4
debian/patches/netrom-motd.patch vendored
View File

@ -1,3 +1,7 @@
Description: Add in motd functionality for Netrom
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2023-08-07
--- a/node.c --- a/node.c
+++ b/node.c +++ b/node.c
@@ -301,6 +301,11 @@ @@ -301,6 +301,11 @@

15
debian/patches/zlib-ifdef.patch vendored
View File

@ -1,6 +1,10 @@
Description: Fix zlib ifdef to ensure it builds right
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2023-08-07
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -74,14 +74,15 @@ @@ -74,14 +74,14 @@
_sleep 1 _sleep 1
echo -n "Checking for the existence of the Zlib headers... " echo -n "Checking for the existence of the Zlib headers... "
ZLIB="" ZLIB=""
@ -10,13 +14,10 @@
do do
if [ -f $zlibdir/zlib.h ] if [ -f $zlibdir/zlib.h ]
then then
- echo $zlibdir/zlib.h echo $zlibdir/zlib.h
- ZLIB="-lz" ZLIB="-lz"
- HAVEZLIB="#define HAVE_ZLIB 1" - HAVEZLIB="#define HAVE_ZLIB 1"
+ echo "skipping zlib until it works right..." + HAVEZLIB="#define HAVE_ZLIB_H 1"
+ # echo $zlibdir/zlib.h
+ # ZLIB="-lz"
+ # HAVEZLIB="#define HAVE_ZLIB_H 1"
fi fi
done done
if [ -z "$ZLIB" ] if [ -z "$ZLIB" ]