From 534a7937e8e96ed60bec1028dd64cb1b2dfb8587 Mon Sep 17 00:00:00 2001 From: hibby Date: Sat, 10 Feb 2018 20:19:10 +0000 Subject: [PATCH] Restoring non interactive mode configure --- debian/changelog | 9 +++++++++ debian/control | 4 ++-- debian/patches/install-dir-creation | 2 +- debian/patches/makefile-install-locations | 2 +- debian/patches/non-interactive-install.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 debian/patches/non-interactive-install.patch diff --git a/debian/changelog b/debian/changelog index b42cfc1..cb4c512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +uronode (2.8.1-2) UNRELEASED; urgency=medium + + * Salsa vcs added + * Architecture changed to linux-any + * Non-Interactive configure patched in + + + -- Dave Hibberd Sat, 10 Feb 2018 19:41:57 +0000 + uronode (2.8.1-1) unstable; urgency=medium * New Upstream import diff --git a/debian/control b/debian/control index 867b6f9..eab33bf 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd Build-Depends: debhelper (>= 11), libax25-dev Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/uronode.git -Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/uronode.git +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/ Package: uronode diff --git a/debian/patches/install-dir-creation b/debian/patches/install-dir-creation index 2b69312..d1fff7f 100644 --- a/debian/patches/install-dir-creation +++ b/debian/patches/install-dir-creation @@ -1,6 +1,6 @@ Description: Create proper SBIN_DIR directory at install time Author: Dave Hibberd -Last-Update: 2017-08-22 +Last-Update: 2018-02-10 --- a/Makefile.in +++ b/Makefile.in diff --git a/debian/patches/makefile-install-locations b/debian/patches/makefile-install-locations index bf78158..6580cd3 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: 2015-10-16 +Last-Update: 2018-02-10 --- a/Makefile.include.in +++ b/Makefile.include.in diff --git a/debian/patches/non-interactive-install.patch b/debian/patches/non-interactive-install.patch new file mode 100644 index 0000000..68a2d9b --- /dev/null +++ b/debian/patches/non-interactive-install.patch @@ -0,0 +1,18 @@ +Description: Remove interactive mode from configure, speed up build +Author: Dave Hibberd +Last-Update: 2018-02-10 + +--- a/configure ++++ b/configure +@@ -1,11 +1,5 @@ + #!/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 "$@" diff --git a/debian/patches/series b/debian/patches/series index 330f0f2..e3a7f0c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +non-interactive-install.patch hardening folder-update install-dir-creation