From 22a5ddd6d5beb9fcaddc2021111ceea0caf5e6c9 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Wed, 3 Jul 2019 22:08:08 +0200
Subject: [PATCH] TT#61954 Rework debian/copyright file

- Correct MIT license name from MIT/X11.
- Fix typos in License field names.
- Move catch all Files stanza to the beginning, as more general matches
  should go first.
- Reformat field contents.
- Add an actual License stanza for MIT.

Change-Id: I6795a9d761ea38db93f86a8702594acca5caf6e8
---
 debian/copyright | 148 +++++++++++++++++++++++++++++------------------
 1 file changed, 93 insertions(+), 55 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3726bfa..72ef507 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,58 +3,96 @@ Source: https://www.sipwise.com/
 Upstream-Name: ngcp-prosody
 Upstream-Contact: Sipwise GmbH <development@sipwise.com>
 
-Files: plugins/mod_auth_sql.lua
-Copyright: 2011 Tomasz Sterna <tomek@xiaoka.com>
-           2011 Waqas Hussain <waqas20@gmail.com>
-           2013 Sipwise GmbH <development@sipwise.com>
-License: MIT/X11
-
-Files: plugins/mod_sipwise_vcard_cusax.lua
-Copyright: 2008-2010 Matthew Wild <mwild1@gmail.com>
-           2008-2010 Waqas Hussain <waqas20@gmail.com>
-           2013 Sipwise GmbH <development@sipwise.com>
-License: MIT/X11
-
-Files: plugins/mod_carbons.lua
-Copyright: 2011 Kim Alvefur <zash@zash.se>
-License: MIT/X11
-
-Files: plugins/mod_carbons_copies.lua
-Copyright: 2012 Michael Holzt <kju@fqdn.org>
-           2014 Florian Zeitz <florob@babelmonkeys.de>
-License: MIT/X11
-
-Files: plugins/mod_carbons_adhoc.lua
-Copyright: 2012 Michael Holzt <kju@fqdn.org>
-           2014 Florian Zeitz <florob@babelmonkeys.de>
-License: MIT/X11
-
-Files: plugins/mod_sipwise_lastactivity.lua
-Copyright: 2008-2010 Matthew Wild <mwild1@gmail.com>
-           2008-2010 Waqas Hussain <waqas20@gmail.com>
-           2015 Sipwise GmbH <development@sipwise.com>
-License: MIT/X11
-
-Files: plugins/mod_log_auth.lua
-Copyright: 2013 Kim Alvefur <zash@zash.se>
-License: MIT/X11
-
-Files: plugins/mod_smacks.lua
-Copyright: 2010-2015 Matthew Wild <mwild1@gmail.com>
-           2010 Waqas Hussain <waqas20@gmail.com>
-           2012-2015 Kim Alvefur <zash@zash.se>
-           2012 Thijs Alkemade <thijsalkemade@gmail.com>
-           2014 Florian Zeitz <florob@babelmonkeys.de>
-Licence: MIT/X11
-
-Files: plugins/mod_blocking.lua
-Copyright:  2010-2015 Kim Alvefur <zash@zash.se>
-            2013 Tobias Markmann <tm@ayena.de>
-            2011 Paul Aurich <paul@darkrain42.org>
-            2010 Waqas Hussain <waqas20@gmail.com>
-            2010 Matthew Wild <mwild1@gmail.com>
-Licence: MIT/X11
-
-Files: *
-Copyright: 2013 Sipwise GmbH <development@sipwise.com>
-License: MIT/X11
+Files:
+ *
+Copyright:
+ 2013 Sipwise GmbH <development@sipwise.com>
+License: MIT
+
+Files:
+ plugins/mod_auth_sql.lua
+Copyright:
+ 2011 Tomasz Sterna <tomek@xiaoka.com>
+ 2011 Waqas Hussain <waqas20@gmail.com>
+ 2013 Sipwise GmbH <development@sipwise.com>
+License: MIT
+
+Files:
+ plugins/mod_sipwise_vcard_cusax.lua
+Copyright:
+ 2008-2010 Matthew Wild <mwild1@gmail.com>
+ 2008-2010 Waqas Hussain <waqas20@gmail.com>
+ 2013 Sipwise GmbH <development@sipwise.com>
+License: MIT
+
+Files:
+ plugins/mod_carbons.lua
+Copyright:
+ 2011 Kim Alvefur <zash@zash.se>
+License: MIT
+
+Files:
+ plugins/mod_carbons_copies.lua
+Copyright:
+ 2012 Michael Holzt <kju@fqdn.org>
+ 2014 Florian Zeitz <florob@babelmonkeys.de>
+License: MIT
+
+Files:
+ plugins/mod_carbons_adhoc.lua
+Copyright:
+ 2012 Michael Holzt <kju@fqdn.org>
+ 2014 Florian Zeitz <florob@babelmonkeys.de>
+License: MIT
+
+Files:
+ plugins/mod_sipwise_lastactivity.lua
+Copyright:
+ 2008-2010 Matthew Wild <mwild1@gmail.com>
+ 2008-2010 Waqas Hussain <waqas20@gmail.com>
+ 2015 Sipwise GmbH <development@sipwise.com>
+License: MIT
+
+Files:
+ plugins/mod_log_auth.lua
+Copyright:
+ 2013 Kim Alvefur <zash@zash.se>
+License: MIT
+
+Files:
+ plugins/mod_smacks.lua
+Copyright:
+ 2010-2015 Matthew Wild <mwild1@gmail.com>
+ 2010 Waqas Hussain <waqas20@gmail.com>
+ 2012-2015 Kim Alvefur <zash@zash.se>
+ 2012 Thijs Alkemade <thijsalkemade@gmail.com>
+ 2014 Florian Zeitz <florob@babelmonkeys.de>
+License: MIT
+
+Files:
+ plugins/mod_blocking.lua
+Copyright:
+ 2010-2015 Kim Alvefur <zash@zash.se>
+ 2013 Tobias Markmann <tm@ayena.de>
+ 2011 Paul Aurich <paul@darkrain42.org>
+ 2010 Waqas Hussain <waqas20@gmail.com>
+ 2010 Matthew Wild <mwild1@gmail.com>
+License: MIT
+
+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 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.