[hamradio-commits] [aprx] 10/11: Merge tag 'upstream/2.9.0+dfsg'

[Dave Hibberd]

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

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

commit 931999527678591ddf206b6daec918ef60834a5e
Merge: ea64e74 5e1eb73
Author: Hibby <d at vehibberd.com>
Date:   Sun Jan 22 00:45:10 2017 +0000

    Merge tag 'upstream/2.9.0+dfsg'
    
    Upstream version 2.9.0+dfsg

 debian/copyright | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --cc debian/copyright
index 0feaa64,322cb19..0d3a2ad
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,83 -1,1 +1,88 @@@
 -See LICENSE.
 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: aprx
 +Source: http://thelifeofkenneth.com/aprx/
 +Files-Excluded:
 +  firmware/*
 +  windows/windows-services-in-c-example-4154.zip
 +
 +Files: *
 +Copyright: 2007-2014 Matti Aarnio, OH2MQK, <oh2mqk at sral.fi>
 +	   2014-2017 Kenneth W. Finnegan, W6KWF, <kennethfinnegan2007 at gmail.com>
 +License: BSD-3-Clause
 +
++Files: ssl.*
++Copyright: 1996-2013 Daniel Stenberg, <daniel at haxx.se>
++	   2002-2013 Igor Sysoev and 2011-2013 Nginx, Inc.
++License: CURL Like
++License: BSD-2-Clause
++
 +Files: debian/*
 +Copyright: 2014 Christopher Knadle, <Chris.Knadle at coredump.us>
++	   2017 Dave Hibberd, <d at vehibberd.com>
 +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
++License: BSD-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, <daniel at haxx.se>
-  License: CURL like
++ 
++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.
 +

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