From 779d0da4cced21b84ea85fccaec80736cc4766c0 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sat, 5 Feb 2022 18:18:30 +0000 Subject: [PATCH] New Upstream release and standards bump --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/patches/multiple-definition.patch | 17 ----------------- debian/patches/series | 1 - 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 debian/patches/multiple-definition.patch diff --git a/debian/changelog b/debian/changelog index 1f27172..951adf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +uronode (2.15-1) UNRELEASED; urgency=medium + + * New upstream version 2.15 + * Standards bump to 4.6.0.1 + * Multiple definition patch removed + - Included upstream + + -- Dave Hibberd Sat, 05 Feb 2022 11:58:10 +0000 + uronode (2.13-2) unstable; urgency=medium * Fix runtime bug introduced by changes in folder-update patch for 2.12-1 diff --git a/debian/control b/debian/control index 9413f6a..d26f7f2 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd Build-Depends: debhelper-compat (= 13), libax25-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.0.1 Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git Homepage: https://uronode.sourceforge.net/ diff --git a/debian/patches/multiple-definition.patch b/debian/patches/multiple-definition.patch deleted file mode 100644 index fa9ce8f..0000000 --- a/debian/patches/multiple-definition.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix GCC10 Blocking issues - multiple definitions of globals -Author: Dave Hibberd -Last-Update: 2020-09-20 - ---- a/util.c -+++ b/util.c -@@ -17,8 +17,8 @@ - #include "procinfo.h" - - static char buf[256]; --char *HostName; --char *Prompt; -+//char *HostName; -+//char *Prompt; - - void node_msg(const char *fmt, ...) - { diff --git a/debian/patches/series b/debian/patches/series index 2a0fcdd..5cb9a02 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -multiple-definition.patch non-interactive-install.patch hardening folder-update