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

Update to make SBIN_DIR and cleaning up lots of patch mess, changlog fixed

This commit is contained in:
Dave Hibberd 2020-04-20 02:17:20 +01:00
parent f82df102ac
commit 20b24543a9
9 changed files with 25 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pc/.quilt_patches
View File

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

1
.pc/.quilt_series
View File

@ -1 +0,0 @@
series

1
.pc/.version
View File

@ -1 +0,0 @@
2

11
debian/changelog vendored
View File

@ -1,10 +1,17 @@
uronode (2.11-1) unstable; urgency=medium
uronode (2.11-1) UNRELEASED; urgency=medium
* New upstream update
- Patches Refreshed
* Removed makefile-install-locations patch
-- Dave Hibberd <d@vehibberd.com> Mon, 20 Apr 2020 03:25:08 +0100
uronode (2.10-1) unstable; urgency=medium
* New upstream update
- Patches Refreshed
* Removed multiarch-libc patch, included upstream
-- Dave Hibberd <d@vehibberd.com> Tue, 24 Mar 2020 20:55:58 +0000
-- Dave Hibberd <d@vehibberd.com> Sat, 17 Aug 2019 23:15:37 +0100
uronode (2.9-1) unstable; urgency=medium

14
debian/patches/folder-update vendored
View File

@ -15,13 +15,13 @@ Last-Update: 2018-12-27
-[ "$DATA_DIR" ] || DATA_DIR=/usr/local/share
-[ "$MAN_DIR" ] || MAN_DIR=/usr/local/share/man
-[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/ax25
+[ "$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
+[ "$ETC_DIR" ] || ETC_DIR=debian/uronode/etc/ax25
+[ "$SBIN_DIR" ] || SBIN_DIR=debian/uronode/usr/sbin
+[ "$BIN_DIR" ] || BIN_DIR=debian/uronode/usr/bin
+[ "$LIB_DIR" ] || LIB_DIR=debian/uronode/usr/lib
+[ "$DATA_DIR" ] || DATA_DIR=debian/uronode/usr/share
+[ "$MAN_DIR" ] || MAN_DIR=debian/uronode/usr/share/man
+[ "$VAR_DIR" ] || VAR_DIR=debian/uronode/var/ax25
echo "Welcome to the configuration utility for URONode. This configure script"
echo "will very simply and easily guide you into installling URONode with as"

2
debian/patches/hardening vendored
View File

@ -24,7 +24,7 @@ Last-Update: 2017-08-22
CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
.c.o:
- $(CC) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(CXXFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $<
install: installbin installman installhelp installconf
install -b -m 755 -D -d $(VAR_DIR)

15
debian/patches/install-dir-creation vendored
View File

@ -18,12 +18,11 @@ Last-Update: 2018-02-10
LIBS = -lax25 -lax25io
include Makefile.include
@@ -27,7 +24,7 @@
DIGI_OBJS = $(DIGI_SRC:.c=.o)
CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o)
.c.o:
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(CXXFLAGS) -c $<
+ $(CC) $(CFLAGS) -c $<
@@ -38,6 +35,7 @@
install -b -m 644 -p etc/gateways $(VAR_DIR)/flex
install: installbin installman installhelp installconf
install -b -m 755 -D -d $(VAR_DIR)
installbin: all
+ install -b -m 755 -D -d $(SBIN_DIR)
install -m 755 -s -p uronode $(SBIN_DIR)
install -m 755 -s -p nodeusers $(SBIN_DIR)
install -m 755 -s -p axdigi $(SBIN_DIR)

39
debian/patches/makefile-install-locations vendored
View File

@ -1,39 +0,0 @@
Description: Install files to temporary directory for packaging
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2018-12-27
--- a/configure
+++ b/configure
@@ -1,5 +1,11 @@
#!/bin/sh
+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
+[ "$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 "will very simply and easily guide you into installling URONode with as"

1
debian/patches/series vendored
View File

@ -2,5 +2,4 @@ non-interactive-install.patch
hardening
folder-update
install-dir-creation
makefile-install-locations