[ciderwebmail] 03/10: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

Mon May 9 13:33:48 UTC 2016

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

js pushed a commit to branch master
in repository ciderwebmail.

commit 4964089ee442b25f3ae33bd33bdf9e59b6ddfa53
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon May 9 13:30:33 2016 +0200

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.
---
 debian/copyright | 82 +++++++++++++-------------------------------------------
 1 file changed, 19 insertions(+), 63 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 85b4494..4af7fe6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,15 +11,11 @@ Source: http://ciderwebmail.org/download/index.html
 
 Files: *
 Copyright: Stefan Seifert
-License: Artistic or GPL-1+
-Comment:
- License:
- .
+License-Grant:
  This library is free software; you can redistribute it and/or modify it
  under the same terms as Perl itself.
- .
- Comment:
- .
+License: Artistic or GPL-1+
+Comment:
  Perl 5 is licensed under either the 'Artistic license' or the 'GNU
  General Public License' version 1 or later.
  .
@@ -33,29 +29,23 @@ Copyright: 2007 David Miller <miller at oxygen-icons.org>
   2007 Kenneth Wimer <kwwii at bootsplash.org>
   2007 Nuno Pinheiro <nuno at oxygen-icons.org>
   2007 Riccardo Iaconelli <riccardo at oxygen-icons.org>
-License: LGPL-2.1+
-Comment:
- License:
- .
+License-Grant:
  address_book.png, attachment.png, compose.png, folder.png, inbox.png,
  logout.png, manage_folders.png, mail_forward.png, mail_reply.png,
  mail_reply_all.png, mail_reply_list.png, mimeicons/* message*.png,
  sent.png, flag.png, flag-red.png and trash.png are taken from the KDE 4
  Oxygen icon theme and are covered by LGPL version 2.1 or later
  http://www.gnu.org/licenses/lgpl-2.1.txt
+License: LGPL-2.1+
 
 Files: root/static/images/btn_*.png
  root/static/images/catalyst_logo.png
 Copyright: Catalyst Contributors
-License: Artistic or GPL-1+
-Comment:
- License:
- .
+License-Grant:
  This library is free software. You can redistribute it and/or modify it
  under the same terms as Perl itself.
- .
- Comment:
- .
+License: Artistic or GPL-1+
+Comment:
  Perl 5 is licensed under either the 'Artistic license' or the 'GNU
  General Public License' version 1 or later.
 
@@ -67,28 +57,25 @@ Comment:
 
 Files: debian/*
 Copyright: 2012-2014, Jonas Smedegaard <dr at jones.dk>
+License-Grant:
+ 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 3, or (at your option) any
+ later version.
 License: GPL-3+
 
 Files: debian/patches/1001*
 Copyright: 2013, Jonas Smedegaard <dr at jones.dk>
-License: Artistic or GPL-1+
-Comment:
- License:
- .
+License-Grant:
  This file is distributed under the same license as the CiderWebmail
  package.
+License: Artistic or GPL-1+
 
 License: Artistic
- Comment:
- .
- On Debian systems the 'Artistic License' is located in
- '/usr/share/common-licenses/Artistic'.
+License-Reference: /usr/share/common-licenses/Artistic
 
 License: GPL-1+
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 1 is located
- in '/usr/share/common-licenses/GPL-1'.
+License-Reference: /usr/share/common-licenses/GPL-1
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
@@ -101,40 +88,9 @@ License: Expat
  .
  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-3+
- 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 3, 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.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-2'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: LGPL-2.1+
- Comment:
- .
- On Debian systems the 'GNU Lesser General Public License' version 2.1
- is located in '/usr/share/common-licenses/LGPL-2.1'.
- .
- You should have received a copy of the 'GNU Lesser General Public
- License' along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/LGPL-2.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git

