Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 871b6d55f607193ef36fda79490dbbeecc603bb8..9605724d42624871c95172cc28a2d7df3873aed7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,11 +18,6 @@ Copyright: 1999 - 2000 Scott Wimer
            2005 - 2007 Marco Barisione <marco@barisione.org>
 License: LGPL-2.1+
 
-Files: contrib/hiredis/*
-Copyright: 2006 - 2011 Salvatore Sanfilippo <antirez at gmail dot com>
-           2010 - 2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-License: BSD-3-Clause-Redis
-
 Files: compat/queue.h
 Copyright: 1991, 1993 The Regents of the University of California.
 License: BSD-3-Clause-RotUoC
@@ -48,22 +43,20 @@ Files: contrib/libottery/chacha_merged.c
 Copyright: Ted Krovetz <ted@krovetz.net>
            D. J. Bernstein
 License: public-domain
- Public domain.
 
 Files: contrib/blake2/*
 Copyright: Samuel Neves <sneves@dei.uc.pt>
 License: public-domain
- Public domain.
 
-Files: contrib/lua-fun
+Files: contrib/lua-fun/*
 Copyright: 2013 Roman Tsisyk <roman@tsisyk.com>
 License: MIT
 
-Files: contrib/publicsuffix
-Copyright: 2007-2011, Mozilla Foundation. 
+Files: contrib/publicsuffix/*
+Copyright: 2007-2011, Mozilla Foundation.
 License: MPL-2
 
-Files: contrib/aho-corasic
+Files: contrib/aho-corasick/*
 Copyright: 2009-2014 Mischa Sandberg <mischasan@gmail.com>
 License: LGPL-3+
 
@@ -71,12 +64,6 @@ Files: contrib/xxhash/xxhash.*
 Copyright: 2012-2013, Yann Collet.
 License: BSD-2-Clause
 
-Files: contrib/siphash/*
-Copyright: William Ahern
-           Jean-Philippe Aumasson
-           Daniel J. Berstein
-License: Unlicense
-
 Files: contrib/snowball/*
 Copyright: 2001-2015 Dr Martin Porter
            2002-2015 Richard Boulton
@@ -118,7 +105,6 @@ License: Apache-2.0
 Files: contrib/cdb*
 Copyright: Michael Tokarev <mjt@corpit.ru>
 License: public-domain
- The code is in public domain, that is, you may do anything you want with it.
 Comment:
  The exact meaning of "Public domain" mentioned in the file headers was taken from:
  http://www.corpit.ru/mjt/tinycdb.html
@@ -148,6 +134,9 @@ Copyright: 2011-2015 Vsevolod Stakhov <vsevolod@highsecure.ru>
  2014-2015 Mikhail Gusarov <dottedmag@dottedmag.net>
 License: BSD-2-Clause
 
+License: public-domain
+ Public domain.
+
 License: BSD-1-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -219,32 +208,6 @@ License: BSD-3-Clause-RotUoC
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: BSD-3-Clause-Redis
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 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.
- .
- Neither the name of Redis 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 COPYRIGHT OWNER 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.
-
 License: BSD-3-Clause-Google
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
@@ -369,32 +332,6 @@ License: CC0
  work in doc/cc0.txt.  If not, see
  <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-License: Unlicense
- This is free and unencumbered software released into the public domain.
- .
- Anyone is free to copy, modify, publish, use, compile, sell, or
- distribute this software, either in source code form or as a compiled
- binary, for any purpose, commercial or non-commercial, and by any
- means.
- .
- In jurisdictions that recognize copyright laws, the author or authors
- of this software dedicate any and all copyright interest in the
- software to the public domain. We make this dedication for the benefit
- of the public at large and to the detriment of our heirs and
- successors. We intend this dedication to be an overt act of
- relinquishment in perpetuity of all present and future rights to this
- software under copyright law.
- .
- 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.
- IN NO EVENT SHALL THE AUTHORS 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.
- .
- For more information, please refer to <http://unlicense.org>
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal