diff --git a/debian/changelog b/debian/changelog index a1d8f28..fee51bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +uronode (2.7-1) UNRELEASED; urgency=medium + + * New Upstream import + - Patches refreshed + * debian/patches/hardening + - Updated flags to be included + * debian/patches/install-dir-creation + - Refreshed to accommodate new lines + * debian/patches/flexd-spelling + - Added to fix binary spelling error + * debian/control + - Updated Standards Version to 4.1.1 + - Removed zlib1g-dev dependency + + -- Dave Hibberd Tue, 22 Aug 2017 14:01:16 +0100 + uronode (2.6-1) unstable; urgency=medium * New Upstream import diff --git a/debian/control b/debian/control index def4fa2..049ff37 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: hamradio Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd -Build-Depends: debhelper (>= 9), libax25-dev, zlib1g-dev -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 9), libax25-dev +Standards-Version: 4.1.1 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/uronode.git Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/uronode.git Homepage: http://uronode.sourceforge.net/ diff --git a/debian/patches/flexd-spelling b/debian/patches/flexd-spelling new file mode 100644 index 0000000..31ec403 --- /dev/null +++ b/debian/patches/flexd-spelling @@ -0,0 +1,15 @@ +Description: Fix Lintian binary spelling errors +Author: Dave Hibberd +Last-Update: 2017-08-22 + +--- a/flexd.c ++++ b/flexd.c +@@ -413,7 +413,7 @@ + printf("FlexD version %s.\n\r", VERSION); + printf("Copywrite (c) 2000-2003 by Roy PE1RJA and Stefano IZ5AWZ\n\r"); + printf("Copywrite (c) 2003 - present by Brian Rogers - N1URO.\n\r"); +- printf("FlexD is free sofware and you are welcome to redistribute it\n\r"); ++ printf("FlexD is free software and you are welcome to redistribute it\n\r"); + printf("under the terms of GNU General Public Licence as published\n\r"); + printf("by Free Software Foundation; either version 2 of the License, or\n\r"); + printf("(at your option) any later version.\n\r"); diff --git a/debian/patches/hardening b/debian/patches/hardening index 7c8922d..ea520d6 100644 --- a/debian/patches/hardening +++ b/debian/patches/hardening @@ -1,22 +1,25 @@ Description: Fix Lintian hardening errors caused by flags not being passed to compiler, use debhelper compiler flags Author: Dave Hibberd -Last-Update: 2017-01-21 +Last-Update: 2017-08-22 --- a/Makefile.in +++ b/Makefile.in -@@ -3,7 +3,9 @@ +@@ -3,8 +3,11 @@ CC = gcc LD = gcc # CFLAGS = -O2 -g -s -Wno-unused-result -Wstrict-prototypes -CFLAGS = -DUNIX -g3 -DDEBUG +-LDFLAGS = +# CFLAGS = -DUNIX -g3 -DDEBUG -+CXXFLAGS = -+CPPFLAGS = - LDFLAGS = ++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) ++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) ++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) ++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) LIBS = -lax25 -lax25io -@@ -24,7 +26,7 @@ + include Makefile.include +@@ -24,7 +27,7 @@ DIGI_OBJS = $(DIGI_SRC:.c=.o) CALIBRATE_OBJS = $(CALIBRATE_SRC:.c=.o) .c.o: diff --git a/debian/patches/install-dir-creation b/debian/patches/install-dir-creation index 93942c5..31eeb6c 100644 --- a/debian/patches/install-dir-creation +++ b/debian/patches/install-dir-creation @@ -1,10 +1,10 @@ Description: Create proper SBIN_DIR directory at install time Author: Dave Hibberd -Last-Update: 2015-09-07 +Last-Update: 2017-08-22 --- a/Makefile.in +++ b/Makefile.in -@@ -35,6 +35,7 @@ +@@ -37,6 +37,7 @@ install -b -m 644 -p etc/gateways $(VAR_DIR)/flex installbin: all diff --git a/debian/patches/series b/debian/patches/series index 330f0f2..57cc4b0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +flexd-spelling hardening folder-update install-dir-creation