From f82df102ac4b4ff6d87cffbbaf35a09fa740a143 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Tue, 24 Mar 2020 20:59:16 +0000 Subject: [PATCH] Updated changelog, refreshed patches --- .gitignore | 1 + .pc/.quilt_patches | 1 + .pc/.quilt_series | 1 + .pc/.version | 1 + debian/changelog | 4 +- debian/control | 2 +- debian/patches/install-dir-creation | 34 ++++++++------ debian/patches/makefile-install-locations | 57 ++++++++++++----------- 8 files changed, 56 insertions(+), 45 deletions(-) create mode 100644 .gitignore create mode 100644 .pc/.quilt_patches create mode 100644 .pc/.quilt_series create mode 100644 .pc/.version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2a4f79 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +pc/ diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches new file mode 100644 index 0000000..6857a8d --- /dev/null +++ b/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series new file mode 100644 index 0000000..c206706 --- /dev/null +++ b/.pc/.quilt_series @@ -0,0 +1 @@ +series diff --git a/.pc/.version b/.pc/.version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/.pc/.version @@ -0,0 +1 @@ +2 diff --git a/debian/changelog b/debian/changelog index 851ac3c..1dc1e5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -uronode (2.10-1) unstable; urgency=medium +uronode (2.11-1) unstable; urgency=medium * New upstream update - Patches Refreshed * Removed multiarch-libc patch, included upstream - -- Dave Hibberd Sat, 17 Aug 2019 23:15:37 +0100 + -- Dave Hibberd Tue, 24 Mar 2020 20:55:58 +0000 uronode (2.9-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4e40a4b..ddeb94e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd 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-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git Homepage: http://uronode.sourceforge.net/ diff --git a/debian/patches/install-dir-creation b/debian/patches/install-dir-creation index d1fff7f..ca0c0a7 100644 --- a/debian/patches/install-dir-creation +++ b/debian/patches/install-dir-creation @@ -4,20 +4,26 @@ Last-Update: 2018-02-10 --- a/Makefile.in +++ b/Makefile.in -@@ -2,8 +2,6 @@ - +@@ -3,11 +3,8 @@ CC = 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 - CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) - CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) - CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -@@ -38,6 +36,7 @@ - install -b -m 644 -p etc/gateways $(VAR_DIR)/flex - - installbin: all -+ install -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) +-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) ++CFLAGS = -DUNIX -g3 -DDEBUG ++LDFLAGS = + 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) diff --git a/debian/patches/makefile-install-locations b/debian/patches/makefile-install-locations index c511c3d..ee67e1e 100644 --- a/debian/patches/makefile-install-locations +++ b/debian/patches/makefile-install-locations @@ -2,37 +2,38 @@ Description: Install files to temporary directory for packaging Author: Dave Hibberd 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 +++ b/configure -@@ -20,7 +20,7 @@ - [ "$LIB_DIR" ] || LIB_DIR=/usr/lib - [ "$DATA_DIR" ] || DATA_DIR=/usr/share - [ "$MAN_DIR" ] || MAN_DIR=/usr/share/man +@@ -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 -+[ "$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 "will very simply and easily guide you into installling URONode with as"