From 20b24543a935e0bc2b91e024ae8320528d91a508 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Mon, 20 Apr 2020 02:17:20 +0100 Subject: [PATCH] Update to make SBIN_DIR and cleaning up lots of patch mess, changlog fixed --- .pc/.quilt_patches | 1 - .pc/.quilt_series | 1 - .pc/.version | 1 - debian/changelog | 11 +++++-- debian/patches/folder-update | 14 ++++---- debian/patches/hardening | 2 +- debian/patches/install-dir-creation | 17 +++++----- debian/patches/makefile-install-locations | 39 ----------------------- debian/patches/series | 1 - 9 files changed, 25 insertions(+), 62 deletions(-) delete mode 100644 .pc/.quilt_patches delete mode 100644 .pc/.quilt_series delete mode 100644 .pc/.version delete mode 100644 debian/patches/makefile-install-locations diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches deleted file mode 100644 index 6857a8d..0000000 --- a/.pc/.quilt_patches +++ /dev/null @@ -1 +0,0 @@ -debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series deleted file mode 100644 index c206706..0000000 --- a/.pc/.quilt_series +++ /dev/null @@ -1 +0,0 @@ -series diff --git a/.pc/.version b/.pc/.version deleted file mode 100644 index 0cfbf08..0000000 --- a/.pc/.version +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/changelog b/debian/changelog index 1dc1e5d..f6f757c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 Tue, 24 Mar 2020 20:55:58 +0000 + -- Dave Hibberd Sat, 17 Aug 2019 23:15:37 +0100 uronode (2.9-1) unstable; urgency=medium diff --git a/debian/patches/folder-update b/debian/patches/folder-update index 5af4a89..8501a59 100644 --- a/debian/patches/folder-update +++ b/debian/patches/folder-update @@ -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" diff --git a/debian/patches/hardening b/debian/patches/hardening index ea520d6..9530d65 100644 --- a/debian/patches/hardening +++ b/debian/patches/hardening @@ -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) diff --git a/debian/patches/install-dir-creation b/debian/patches/install-dir-creation index ca0c0a7..7ddae71 100644 --- a/debian/patches/install-dir-creation +++ b/debian/patches/install-dir-creation @@ -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 $< - - install: installbin installman installhelp installconf - install -b -m 755 -D -d $(VAR_DIR) +@@ -38,6 +35,7 @@ + install -b -m 644 -p etc/gateways $(VAR_DIR)/flex + + 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) diff --git a/debian/patches/makefile-install-locations b/debian/patches/makefile-install-locations deleted file mode 100644 index ee67e1e..0000000 --- a/debian/patches/makefile-install-locations +++ /dev/null @@ -1,39 +0,0 @@ -Description: Install files to temporary directory for packaging -Author: Dave Hibberd -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" diff --git a/debian/patches/series b/debian/patches/series index e3a7f0c..5cb9a02 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ non-interactive-install.patch hardening folder-update install-dir-creation -makefile-install-locations