Merge patches from Debian downstream

Author: PhirePhly

Makefile.in

@@ -50,8 +50,8 @@ MANDIR:=$(strip $(MANDIR))
 
 VERSION	= $(shell git describe --tags | cut -b 2- || echo @VERSION_STRING@ | cut -b 2-)
 
-DATE:=$(shell date +"%Y %B %d")
-RFCDATE:=$(shell date +"%a, %d %b %Y %H:%M:%S %z")
+DATE:=$(shell LC_ALL=C date --utc --date="$(SOURCE_DATE_EPOCH)" +"%Y %B %d")
+RFCDATE:=$(shell LC_ALL=C date --utc --date="$(SOURCE_DATE_EPOCH)" +"%a, %d %b %Y %H:%M:%S %z")
 
 DEFS=	-DAPRXVERSION="\"$(VERSION)\"" \
 	-DVARRUN="\"$(VARRUN)\"" -DVARLOG="\"$(VARLOG)\"" \

aprx-stat.8.in

@@ -1,5 +1,4 @@
 .TH aprx\-stat 8 "@DATEVERSION@"
-.LO 8
 .SH NAME
 .B aprx\-stat
 \- statistics utility for

aprx.8.in

@@ -1,5 +1,4 @@
 .TH aprx 8 "@DATEVERSION@"
-.LO 8
 .SH NAME
 .B Aprx-2
 \- An APRS iGate application with integrated Digipeater.
@@ -20,7 +19,7 @@ infrastructure services for APRS protocol use.
 .PP
 A more detailed manual is available at:
 .br
-http://ham.zmailer.org/oh2mqk/aprx/aprx-manual.pdf
+http://thelifeofkenneth.com/aprx/aprx-manual.pdf
 .PP
 .SH FEATURES
 The Aprx begun as a receive-only APRS iGate application with minimum system
@@ -329,7 +328,7 @@ mycall  N0CALL-1
 # Unique code for your callsign to allow transmitting packets
 # into the APRS-IS.
 #
-passcode -1
+passcode \-1
 
 
 
@@ -1403,9 +1402,9 @@ Couple web sites:
 .br
 .IR "http://www.aprs-is.net/" ,
 .br
-.IR "http://wiki.ham.fi/Aprx.en" ,
+.IR "http://thelifeofkenneth.com/aprx/" ,
 .br
-.I "http://ham.zmailer.org/oh2mqk/aprx/aprx-manual.pdf"
+.I "http://thelifeofkenneth.com/aprx/aprx-manual.pdf"
 .PP
 .BR aprx-stat (8)
 

debian/copyright

@@ -1 +1,78 @@
-See LICENSE.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: aprx
+Source: http://ham.zmailer.org/oh2mqk/aprx/
+
+Files: *
+Copyright: 2007-2014 Matti Aarnio, OH2MQK, <[email protected]>
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2014 Christopher Knadle <[email protected]>
+License: BSD-3-Clause
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: ssl.*
+Copyright: 2002-2013 Igor Sysoev and 2011-2013 Nginx, Inc.
+License: BSD like 2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ .
+ Copyright: 1996 - 2013, Daniel Stenberg, <[email protected]>
+ License: CURL like
+ Permission to use, copy, modify, and distribute this software for any purpose
+ with or without fee is hereby granted, provided that the above copyright
+ notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall not
+ be used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization of the copyright holder.