[SCM] gerbera/master: Update debian/copyright

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bb482258f3642d599ace913a939ec4fc8f94044a
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Oct 11 18:28:01 2017 +0100

    Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 7f517fe..d053aa6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,38 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Gerbera
 Source: https://github.com/v00d00/gerbera
+Files-Excluded: web/vendor
 
 Files: *
 Copyright:
  2005-2013, Gena Batyan <bgeradz at mediatomb.cc>
  2005-2013, Sergey Bostandzhyan <jin at mediatomb.cc>
  2006-2010, Leonhard Wimmer <leo at mediatomb.cc>
- 2006, Rohan McGovern  <rohan at mcgovern.id.au>
+ 2006, Rohan McGovern <rohan at mcgovern.id.au>
  2007, Ingo Preiml <ipreiml at edu.uni-klu.ac.at>
  2016-2017, Gerbera Contributors
 License: GPL-2
 
-Files: cmake/FindEXIF.cmake
+Files:
+ cmake/FindEXIF.cmake
+ cmake/FindEXIV2.cmake
 Copyright: 2011, Simone Rossetto <simros85 at gmail.com>
 License: GPL-3+
 
 Files:
  cmake/FindFFMPEG.cmake
- cmake/FindLibUUID.cmake
  cmake/FindSQLite3.cmake
  cmake/FindTaglib.cmake
 Copyright:
  1993-2015, Ken Martin, Will Schroeder, Bill Lorensen
+ 2006, Laurent Montel <montel at kde.org>
  2008, Andreas Schneider <mail at cynapses.org>
  2008, Bjoern Ricks <bjoern.ricks at googlemail.com>
- 2006, Laurent Montel <montel at kde.org>
 License: BSD-3-clause
 
-Files: cmake/FindINotify.cmake
-Copyright: ownCloud, Inc
-License: BSD-3-clause
+Files: cmake/FindLFS.cmake
+Copyright: 2016, Julian Andres Klode <jak at debian.org>
+License: Expat
 
 Files: cmake/FindMySQL.cmake
 Copyright: 1995-2007 MySQL AB
@@ -43,7 +45,7 @@ Copyright:
  2017, James Cowgill <jcowgill at debian.org>
 License: GPL-2
 
-Files: src/md5/*
+Files: src/contrib/*
 Copyright: 1999, Aladdin Enterprises
 License: Zlib
 
@@ -65,8 +67,10 @@ Copyright: 2004-2008, Angus Turnbull
 License: LGPL-2.1+
 
 Files: web/js/md5.js
-Copyright: 1999-2002, Paul Johnston
-License: BSD-3-clause
+Copyright:
+ 1999-2002, Paul Johnston
+ 2011, Sebastian Tschan
+License: Expat
 
 Files: web/js/nanotree.js
 Copyright:
@@ -112,6 +116,26 @@ License: BSD-3-clause
  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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 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.
+
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 2

-- 
gerbera packaging