Updated changelog, refreshed patches

This commit is contained in:
Dave Hibberd 2020-03-24 20:59:16 +00:00
parent 93a75b098c
commit f82df102ac
8 changed files with 56 additions and 45 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
pc/

1
.pc/.quilt_patches Normal file
View File

@ -0,0 +1 @@
debian/patches

1
.pc/.quilt_series Normal file
View File

@ -0,0 +1 @@
series

1
.pc/.version Normal file
View File

@ -0,0 +1 @@
2

4
debian/changelog vendored
View File

@ -1,10 +1,10 @@
uronode (2.10-1) unstable; urgency=medium uronode (2.11-1) unstable; urgency=medium
* New upstream update * New upstream update
- Patches Refreshed - Patches Refreshed
* Removed multiarch-libc patch, included upstream * Removed multiarch-libc patch, included upstream
-- Dave Hibberd <d@vehibberd.com> Sat, 17 Aug 2019 23:15:37 +0100 -- Dave Hibberd <d@vehibberd.com> Tue, 24 Mar 2020 20:55:58 +0000
uronode (2.9-1) unstable; urgency=medium uronode (2.9-1) 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 (=12), libax25-dev Build-Depends: debhelper-compat (=12), libax25-dev
Standards-Version: 4.4.0.1 Standards-Version: 4.5.0.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: http://uronode.sourceforge.net/ Homepage: http://uronode.sourceforge.net/

View File

@ -4,20 +4,26 @@ Last-Update: 2018-02-10
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -2,8 +2,6 @@ @@ -3,11 +3,8 @@
CC = gcc CC = gcc
LD = gcc LD = gcc
-# CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes # CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes
-# CFLAGS = -DUNIX -g3 -DDEBUG -# CFLAGS = -DUNIX -g3 -DDEBUG
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
@@ -38,6 +36,7 @@ -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
install -b -m 644 -p etc/gateways $(VAR_DIR)/flex +CFLAGS = -DUNIX -g3 -DDEBUG
+LDFLAGS =
installbin: all LIBS = -lax25 -lax25io
+ install -m 755 -D -d $(SBIN_DIR)
install -m 755 -s -p uronode $(SBIN_DIR) include Makefile.include
install -m 755 -s -p nodeusers $(SBIN_DIR) @@ -27,7 +24,7 @@
install -m 755 -s -p axdigi $(SBIN_DIR) DIGI_OBJS = $(DIGI_SRC:.c=.o)
CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
.c.o:
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(CXXFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $<
install: installbin installman installhelp installconf
install -b -m 755 -D -d $(VAR_DIR)

View File

@ -2,37 +2,38 @@ Description: Install files to temporary directory for packaging
Author: Dave Hibberd <d@vehibberd.com> Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-12-27 Last-Update: 2018-12-27
--- a/Makefile.include.in
+++ b/Makefile.include.in
@@ -2,12 +2,12 @@
ARCH = @ARCH@
# Paths
-ETC_DIR = @ETC_DIR@
-SBIN_DIR = @SBIN_DIR@
-BIN_DIR = @BIN_DIR@
-LIB_DIR = @LIB_DIR@
-MAN_DIR = @MAN_DIR@
-VAR_DIR = @VAR_DIR@
+ETC_DIR = debian/uronode@ETC_DIR@
+SBIN_DIR = debian/uronode@SBIN_DIR@
+BIN_DIR = debian/uronode@BIN_DIR@
+LIB_DIR = debian/uronode@LIB_DIR@
+MAN_DIR = debian/uronode@MAN_DIR@
+VAR_DIR = debian/uronode@VAR_DIR@
# Is Zlib available?
-ZLIB = @ZLIB@
\ No newline at end of file
+ZLIB = @ZLIB@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -20,7 +20,7 @@ @@ -1,5 +1,11 @@
[ "$LIB_DIR" ] || LIB_DIR=/usr/lib #!/bin/sh
[ "$DATA_DIR" ] || DATA_DIR=/usr/share
[ "$MAN_DIR" ] || MAN_DIR=/usr/share/man +echo -n "Use interactive mode? [Y/n]: "; read answer
+if [ "$answer" = "Y" -o "$answer" = "y" -o "$answer" = "" ]
+ then NON_INTERACTIVE=0;
+ else NON_INTERACTIVE=1;
+fi
+
_sleep()
{
[ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
@@ -14,13 +20,13 @@
_sleep 2
make distclean > make.debug
-[ "$ETC_DIR" ] || ETC_DIR=/etc/ax25
-[ "$SBIN_DIR" ] || SBIN_DIR=/usr/sbin
-[ "$BIN_DIR" ] || BIN_DIR=/usr/bin
-[ "$LIB_DIR" ] || LIB_DIR=/usr/lib
-[ "$DATA_DIR" ] || DATA_DIR=/usr/share
-[ "$MAN_DIR" ] || MAN_DIR=/usr/share/man
-[ "$VAR_DIR" ] || VAR_DIR=/var/lib/ax25 -[ "$VAR_DIR" ] || VAR_DIR=/var/lib/ax25
+[ "$VAR_DIR" ] || VAR_DIR=/var/ax25 +[ "$ETC_DIR" ] || ETC_DIR=/usr/local/etc/ax25
+[ "$SBIN_DIR" ] || SBIN_DIR=/usr/local/sbin
+[ "$BIN_DIR" ] || BIN_DIR=/usr/local/bin
+[ "$LIB_DIR" ] || LIB_DIR=/usr/local/lib
+[ "$DATA_DIR" ] || DATA_DIR=/usr/local/share
+[ "$MAN_DIR" ] || MAN_DIR=/usr/local/share/man
+[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/ax25
echo "Welcome to the configuration utility for URONode. This configure script" echo "Welcome to the configuration utility for URONode. This configure script"
echo "will very simply and easily guide you into installling URONode with as" echo "will very simply and easily guide you into installling URONode with as"