[hamradio-commits] [uronode] 03/10: Merge tag 'upstream/2.4'

[Dave Hibberd]

This is an automated email from the git hooks/post-receive script.

hibby-guest pushed a commit to branch master
in repository uronode.

commit 944a20363f6ccbae77269f73e554f077d24f2e52
Merge: 34f191e 0ed015b
Author: Dave Hibberd <dave.hibberd at gmail.com>
Date:   Sun Nov 22 14:56:30 2015 +0000

    Merge tag 'upstream/2.4'
    
    Upstream version 2.4

 CHANGES.2                    | 100 ++++++++++++++++-
 INSTALL                      |   4 +-
 Makefile.in                  |  17 ++-
 axdigi.c                     |  54 +++++++++-
 calibrate                    | Bin 0 -> 590605 bytes
 command.c                    |   6 +-
 config.h.in                  |   1 +
 configure                    |  34 ++++--
 debian/patches/folder-update |  28 ++---
 debian/patches/series        |   1 -
 flexd.c                      |   9 +-
 gateway.c                    |  19 +++-
 man/axdigi.8                 |  52 +++++++++
 man/axdigi.8.gz              | Bin 1006 -> 0 bytes
 man/flexd.8                  |  28 +++++
 man/flexd.conf.5             |  51 +++++++++
 man/flexd.conf.5.gz          | Bin 988 -> 0 bytes
 man/nodeusers.1              |  36 +++++++
 man/nodeusers.1.gz           | Bin 596 -> 0 bytes
 man/uronode.8                | 245 +++++++++++++++++++++++++++++++++++++++++
 man/uronode.8.gz             | Bin 3287 -> 0 bytes
 man/uronode.conf.5           | 252 +++++++++++++++++++++++++++++++++++++++++++
 man/uronode.conf.5.gz        | Bin 3333 -> 0 bytes
 man/uronode.perms.5          | 117 ++++++++++++++++++++
 man/uronode.perms.5.gz       | Bin 1267 -> 0 bytes
 node.c                       |  17 +--
 node.h                       |   4 +-
 router.c                     |  21 +++-
 sysinfo.c                    |   2 +-
 29 files changed, 1037 insertions(+), 61 deletions(-)

diff --cc debian/patches/folder-update
index bc3435e,0000000..c708e6b
mode 100644,000000..100644
--- a/debian/patches/folder-update
+++ b/debian/patches/folder-update
@@@ -1,32 -1,0 +1,34 @@@
 +Description: Update the folders in which Uronode is installed
 +Author: Dave Hibberd <d at vehibberd.com>
 +Last-Update: 2015-10-16
 +
 +--- a/configure
 ++++ b/configure
 +@@ -1,5 +1,5 @@
 + #!/bin/sh
 +-
 ++NON_INTERACTIVE="1"
 + _sleep()
 + {
 +   [ "$NON_INTERACTIVE" = 1 ] || sleep "$@"
- @@ -14,12 +14,12 @@
++@@ -14,13 +14,13 @@
 + _sleep 2
 + make distclean > make.debug
 + 
- -ETC_DIR=/usr/local/etc/ax25
- -SBIN_DIR=/usr/local/sbin
- -BIN_DIR=/usr/local/bin
- -LIB_DIR=/usr/local/lib
- -MAN_DIR=/usr/local/share/man
- -VAR_DIR=/usr/local/var/ax25
- +ETC_DIR=/etc/ax25
- +SBIN_DIR=/usr/sbin
- +BIN_DIR=/usr/bin
- +LIB_DIR=/usr/lib
- +MAN_DIR=/usr/share/man
- +VAR_DIR=/var/lib/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
+++[ "$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
 + 
 + echo "Welcome to the configuration utility for URONode. This configure script"
 + echo "will very simply and easily guide you into installling URONode with as"
diff --cc debian/patches/series
index 5dd5f6e,0000000..5113b0a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,5 @@@
 +remove-cflags
 +folder-update
- no-install-gz-manpages
 +install-dir-creation
 +makefile-install-locations
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/uronode.git