Update debian/copyright

1 files changed, 50 insertions, 30 deletions

diff --git a/debian/copyright b/debian/copyright
index e734cc5..bb14c5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,10 @@ Upstream-Name: SFML (Simple and Fast Multimedia Library)
 Source: https://github.com/SFML/SFML
  Repackaged to remove external libraries and non-dfsg example resources
 Files-Excluded:
- examples/android/assets/canary.wav
- examples/android/assets/orchestral.ogg
+ examples/android/app/src/main/assets/canary.wav
+ examples/android/app/src/main/assets/orchestral.ogg
+ examples/iOS/resources/canary.wav
+ examples/iOS/resources/orchestral.ogg
  examples/opengl/resources/background.jpg
  examples/opengl/resources/texture.jpg
  examples/shader/resources/background.jpg
@@ -15,7 +17,7 @@ Files-Excluded:
  extlibs/headers/AL
  extlibs/headers/FLAC
  extlibs/headers/freetype2
- extlibs/headers/jpeg
+ extlibs/headers/mingw
  extlibs/headers/ogg
  extlibs/headers/vorbis
  extlibs/libs-*
@@ -23,38 +25,37 @@ Files-Excluded:
 
 Files: *
 Copyright:
- 2007-2017 Laurent Gomila <laurent.gom@sfml-dev.org>
- 2007-2017 Marco Antognini <antognini.marco@gmail.com>
- 2013-2014 Jonathan De Wachter <dewachter.jonathan@gmail.com>
+ 2013, David Demelier <demelier.david@gmail.com>
+ 2013-2014, Jonathan De Wachter <dewachter.jonathan@gmail.com>a
+ 2007-2018, Laurent Gomila <laurent.gom@sfml-dev.org>
+ 2007-2018, Marco Antognini <antognini.marco@gmail.com>
 License: Zlib
 
-Files: debian/*
+Files:
+ cmake/Modules/FindFreetype.cmake
+ cmake/Modules/FindUDev.cmake
+ cmake/toolchains/*
 Copyright:
- 2008,2009 Christoph Egger <debian@christoph-egger.org>
- 2013-2017 James Cowgill <jcowgill@debian.org>
-License: Zlib
-
-Files: cmake/Modules/FindFreetype.cmake
-Copyright: 2007-2009 Kitware, Inc.
-License: BSD-3-clause
-
-Files: cmake/Modules/FindUDev.cmake
-Copyright: 2011 Petr Vanek <petr@scribus.info>
+ 2011-2014, Andrey Kamaev <andrey.kamaev@itseez.com>
+ 2016, Bogdan Cristea <cristeab@gmail.com>
+ 2010-2011, Ethan Rublee <ethan.ruble@gmail.com>
+ 2007-2009, Kitware, Inc.
+ 2011, Petr Vanek <petr@scribus.info>
 License: BSD-3-clause
 
-Files: cmake/toolchains/android.toolchain.cmake
+Files: debian/*
 Copyright:
- 2010-2011 Ethan Rublee <ethan.ruble@gmail.com>
- 2011-2014 Andrey Kamaev <andrey.kamaev@itseez.com>
- 2014 Jonathan De Wachter <dewachter.jonathan@gmail.com>
-License: BSD-3-clause
+ 2008-2009 Christoph Egger <debian@christoph-egger.org>
+ 2013-2018 James Cowgill <jcowgill@debian.org>
+License: Zlib
 
 Files:
  debian/missing-sources/sfml-final-clean.svg
- examples/android/assets/image.png
- examples/android/res/*/sfml_logo.png
+ examples/android/app/src/main/assets/image.png
+ examples/android/app/src/main/res/*/sfml_logo.png
  examples/cocoa/resources/icon.icns
  examples/cocoa/resources/logo.png
+ examples/iOS/resources/image.png
  examples/shader/resources/logo.png
 Copyright: Public Domain
 License: public-domain-logo
@@ -62,8 +63,8 @@ License: public-domain-logo
  See http://en.sfml-dev.org/forums/index.php?topic=4960.msg78285#msg78285
 
 Files:
+ examples/android/app/src/main/assets/sansation.ttf
  examples/*/resources/sansation.ttf
- examples/android/assets/sansation.ttf
 Copyright: 2011 Bernd Montag <berndmontag@gmx.de>
 License: OFL-1.1
 
@@ -76,11 +77,11 @@ Copyright: 2014 JaggedStone
 License: CC0-1.0
 Comment: http://opengameart.org/content/magic-spell-sfx
 
-Files: extlibs/headers/stb_image/*
-Copyright: Public Domain
-License: public-domain-stb
- The stb_image library (http://nothings.org/stb_image.c) is explicitly
- in the public domain.
+Files:
+ examples/island/stb_perlin.h
+ extlibs/headers/stb_image/*
+Copyright: 2007, Sean Barrett
+License: Expat
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -109,6 +110,25 @@ License: BSD-3-clause
  ARISING IN ANY WAY OUT OF 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: CC0-1.0
  Creative Commons CC0 1.0 Universal
  .