From c63e53bba9cfde78d3891edd33d91dd0a3b74f0c Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Thu, 27 Dec 2018 16:20:56 +0000 Subject: [PATCH] 2.9-1 release for testing --- .gitignore | 1 + debian/changelog | 16 ++++++++--- debian/control | 2 +- debian/copyright | 2 +- debian/patches/flexd-spelling | 15 ----------- debian/patches/folder-update | 4 +-- debian/patches/makefile-install-locations | 4 +-- debian/patches/multiarch-libc.patch | 15 +++++++++++ debian/patches/no-install-gz-manpages | 33 ----------------------- debian/patches/series | 1 + 10 files changed, 36 insertions(+), 57 deletions(-) create mode 100644 .gitignore delete mode 100644 debian/patches/flexd-spelling create mode 100644 debian/patches/multiarch-libc.patch delete mode 100644 debian/patches/no-install-gz-manpages diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..224e7f0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc/ diff --git a/debian/changelog b/debian/changelog index cb4c512..d1b336a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,21 @@ -uronode (2.8.1-2) UNRELEASED; urgency=medium +uronode (2.9-1) unstable; urgency=medium * Salsa vcs added * Architecture changed to linux-any * Non-Interactive configure patched in + * Upstream bump to 2.9 + - Patches Refreshed + * New patch added (Closes: #911491) + - Allow the compiler to choose net/if.h + * Two old patches Removed + - flexd-spelling + - no-install-gz-manpages + * debian/control + - Updated to Standards Version 4.3.0.1 + * debian/copyright + - Secure Copyright url added - - -- Dave Hibberd Sat, 10 Feb 2018 19:41:57 +0000 + -- Dave Hibberd Thu, 27 Dec 2018 16:19:08 +0000 uronode (2.8.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index eab33bf..29ebafd 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd Build-Depends: debhelper (>= 11), libax25-dev -Standards-Version: 4.1.3 +Standards-Version: 4.3.0.1 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/copyright b/debian/copyright index 0c1ab82..c6c3dad 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: uronode Source: http://sourceforge.net/projects/uronode/files/uronode-2.3.1.tar.gz/download diff --git a/debian/patches/flexd-spelling b/debian/patches/flexd-spelling deleted file mode 100644 index 31ec403..0000000 --- a/debian/patches/flexd-spelling +++ /dev/null @@ -1,15 +0,0 @@ -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/folder-update b/debian/patches/folder-update index ad5da98..5af4a89 100644 --- a/debian/patches/folder-update +++ b/debian/patches/folder-update @@ -1,10 +1,10 @@ Description: Update the folders in which Uronode is installed Author: Dave Hibberd -Last-Update: 2017-01-21 +Last-Update: 2018-12-27 --- a/configure +++ b/configure -@@ -20,13 +20,13 @@ +@@ -14,13 +14,13 @@ _sleep 2 make distclean > make.debug diff --git a/debian/patches/makefile-install-locations b/debian/patches/makefile-install-locations index 6580cd3..c511c3d 100644 --- a/debian/patches/makefile-install-locations +++ b/debian/patches/makefile-install-locations @@ -1,6 +1,6 @@ Description: Install files to temporary directory for packaging Author: Dave Hibberd -Last-Update: 2018-02-10 +Last-Update: 2018-12-27 --- a/Makefile.include.in +++ b/Makefile.include.in @@ -27,7 +27,7 @@ Last-Update: 2018-02-10 +ZLIB = @ZLIB@ --- a/configure +++ b/configure -@@ -26,7 +26,7 @@ +@@ -20,7 +20,7 @@ [ "$LIB_DIR" ] || LIB_DIR=/usr/lib [ "$DATA_DIR" ] || DATA_DIR=/usr/share [ "$MAN_DIR" ] || MAN_DIR=/usr/share/man diff --git a/debian/patches/multiarch-libc.patch b/debian/patches/multiarch-libc.patch new file mode 100644 index 0000000..58bc32e --- /dev/null +++ b/debian/patches/multiarch-libc.patch @@ -0,0 +1,15 @@ +Description: Stop Uronode hard-coding location of net/if.h +Author: Helmut Grohne +Last-Update: 2018-12-27 + +--- a/axdigi.c ++++ b/axdigi.c +@@ -21,7 +21,7 @@ + * 12th June 1997. + */ + +-#include ++#include + #include + #include + #include diff --git a/debian/patches/no-install-gz-manpages b/debian/patches/no-install-gz-manpages deleted file mode 100644 index be06029..0000000 --- a/debian/patches/no-install-gz-manpages +++ /dev/null @@ -1,33 +0,0 @@ -Description: Prevent installation of gzipped manpages, they have been moved to the debian folder and unzipped -Author: Dave Hibberd -Last-Update: 2015-09-07 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -24,7 +24,7 @@ - .c.o: - $(CC) $(CFLAGS) -c $< - --install: installbin installman installhelp installconf -+install: installbin installhelp installconf - install -m 755 -D -d $(VAR_DIR) - install -m 755 -D -d $(VAR_DIR)/node - install -m 644 -p etc/loggedin $(VAR_DIR)/node -@@ -53,16 +53,7 @@ - install -m 600 -p etc/uronode.routes $(ETC_DIR) - install -m 600 -p etc/flexd.conf $(ETC_DIR) - --installman: -- install -m 755 -D -d $(MAN_DIR)/man1 $(MAN_DIR)/man5 $(MAN_DIR)/man8 -- install -m 644 -p man/nodeusers.1.gz $(MAN_DIR)/man1 -- install -m 644 -p man/uronode.conf.5.gz $(MAN_DIR)/man5 -- install -m 644 -p man/uronode.perms.5.gz $(MAN_DIR)/man5 -- install -m 644 -p man/flexd.conf.5.gz $(MAN_DIR)/man5 -- install -m 644 -p man/uronode.8.gz $(MAN_DIR)/man8 -- install -m 644 -p man/axdigi.8.gz $(MAN_DIR)/man8 -- --upgrade: installman -+upgrade: - install -m 755 -p uronode $(SBIN_DIR) - install -m 755 -p nodeusers $(SBIN_DIR) - install -m 755 -p flexd $(SBIN_DIR) diff --git a/debian/patches/series b/debian/patches/series index e3a7f0c..1d4667e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +multiarch-libc.patch non-interactive-install.patch hardening folder-update