[mupen64plus-video-glide64mk2] 54/60: Rewrite debian copyright

Thu Nov 26 06:16:18 UTC 2015

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-glide64mk2.

commit a0958e01f647d22075c9e316e313cb2f364d411d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat May 2 11:06:52 2015 +0200

    Rewrite debian copyright
---
 debian/changelog |   2 +
 debian/copyright | 158 +++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94a5f23..3269b58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mupen64plus-video-glide64mk2 (2.5-1) UNRELEASED; urgency=medium
   * debian/copyright:
     - Update years
     - Fix errors in paths to specific files
+    - Reorder copyright sections and remove some wildcards
+    - Add new files in 2.5
   * debian/patches:
     - Remove upstream merged empty_dlist.patch, init_quit.patch,
       kfreebsd_hurd_support.patch, load_hires_cache.patch,
diff --git a/debian/copyright b/debian/copyright
index bb1b4a2..93ae3ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,45 +1,91 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mupen64plus-video-glide64mk2
 Upstream-Contact: Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
 Source: https://github.com/mupen64plus/mupen64plus-video-glide64mk2/
 
 Files: *
-Copyright: 2012-2013, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
+Copyright: 2003-2009, Sergey 'Gonetz' Lipski
+  2002, Dave2001 <Dave2999 at hotmail.com>
 License: GPL-2+
 
-Files: src/*
-Copyright: 2001-2002, Dave2001 <Dave2999 at hotmail.com>
-           2003-2009, Sergey 'Gonetz' Lipski
-           2007, Hiroshi 'KoolSmoky' Morii <koolsmoky at users.sourceforge.net>
+Files: debian/*
+Copyright: 2009-2015, Sven Eckelmann <sven at narfation.org>
+  2009-2015, Tobias Loose <TobiasLoose at gmx.de>
 License: GPL-2+
 
-Files: src/Glide64/Config.*
-Copyright: 2001-2002, Dave2001 <Dave2999 at hotmail.com>
-           2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
+Files: projects/unix/Makefile
+Copyright: 2007-2008, Jesse 'DarkJezter' Dean
+  2007-2008, Scott 'Tillin9' Knauert
+  2007-2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
+  2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
 License: GPL-2+
 
-Files: src/*/m64p.h
+Files: src/Glide64/Config.cpp
+  src/Glide64/Config.h
 Copyright: 2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
+  2002, Dave2001 <Dave2999 at hotmail.com>
+License: GPL-2+
+
+Files: src/Glide64/FrameSkipper.cpp
+  src/Glide64/FrameSkipper.h
+Copyright: 2011, yongzh <freeman.yong at gmail.com>
+License: GPL-2+
+
+Files: src/Glide64/Ini.cpp
+  src/Glide64/Ini.h
+Copyright: 2002, Dave2001 <Dave2999 at hotmail.com>
 License: GPL-2+
 
-Files: src/Glide64/osal_*
+Files: src/Glide64/m64p.h
+Copyright: 2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
+License: GPL-2+
+
+Files: src/Glide64/osal_dynamiclib.h
+  src/Glide64/osal_dynamiclib_unix.c
+  src/Glide64/osal_dynamiclib_win32.c
 Copyright: 2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
 License: GPL-2+
 
 Files: src/Glide64/winlnxdefs.h
-Copyright: 2002, Dave2001 <Dave2999 at hotmail.com>
-           2003-2009, Sergey 'Gonetz' Lipski
-           2012-2013, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
-           2012-2013, balrog
+Copyright: 2012, 2013, balrog
+  2012, 2013, wahrhaft
+  2003-2009, Sergey 'Gonetz' Lipski
+  2002, Dave2001 <Dave2999 at hotmail.com>
 License: GPL-2+
 
-Files: projects/unix/Makefile
-Copyright: 2007-2008, Jesse 'DarkJezter' Dean
-           2007-2008, Scott 'Tillin9' Knauert
-	   2007-2009, Richard 'Richard42' Goedeken <Richard at fascinationsoftware.com>
-           2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
+Files: src/GlideHQ/*
+Copyright: 2007, Hiroshi Morii <koolsmoky at users.sourceforge.net>
+License: GPL-2+
+
+Files: src/GlideHQ/TextureFilters.cpp
+  src/GlideHQ/TextureFilters_hq2x.cpp
+  src/GlideHQ/TextureFilters_hq2x.h
+  src/GlideHQ/TextureFilters_lq2x.h
+Copyright: 2007, Hiroshi Morii <koolsmoky at users.sourceforge.net>
+  2003, Rice1964
 License: GPL-2+
 
+Files: src/GlideHQ/tc-1.1+/*
+Copyright: 2004, Daniel Borca
+License: GPL-2+
+
+Files: src/GlideHQ/tc-1.1+/fxt1.c
+  src/GlideHQ/tc-1.1+/texstore.c
+Copyright: 1999-2008, Brian Paul
+License: Expat
+
+Files: src/GlideHQ/tc-1.1+/fxt1.h
+Copyright: 2004, Daniel Borca
+License: Expat
+
+Files: src/GlideHQ/tc-1.1+/s2tc/*
+Copyright: 2011, Rudolf Polzer
+License: Expat
+
+Files: src/GlideHQ/tc-1.1+/s2tc/txc_dxtn.h
+Copyright: 2004, Roland Scheidegger
+License: Expat
+
 Files: src/Glitch64/*
 Copyright: 2007, Hiroshi 'KoolSmoky' Morii <koolsmoky at users.sourceforge.net>
 License: GPL-2+
@@ -295,43 +341,43 @@ License: other
  	HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
  	DAMAGES.
 
-Files: src/GlideHQ/TextureFilters.cpp src/GlideHQ/TextureFilters_?q2x.*
-Copyright: 2003, Rice1964
-License: GPL-2+
-
-Files: src/GlideHQ/tc-1.1+/*
-Copyright: 2007, Daniel Borca
-           2007, Hiroshi 'KoolSmoky' Morii <koolsmoky at users.sourceforge.net>
-License: GPL-2+
-
-Files: src/GlideHQ/tc-1.1+/texstore.c
-Copyright: 1999-2004, Brian Paul
-           2007, Hiroshi 'KoolSmoky' Morii <koolsmoky at users.sourceforge.net>
+Files: src/Glitch64/m64p.h
+Copyright: 2010, Jon 'wahrhaft' Ring <wahrh4ft at gmail.com>
 License: GPL-2+
 
-Files: debian/*
-Copyright: 2009-2015, Sven Eckelmann <sven at narfation.org>
-           2009-2015, Tobias Loose <TobiasLoose at gmx.de>
-License: GPL-2+
+License: Expat
+ The MIT License
+ .
+ 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 as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991, or (at
+ your option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64mk2.git

