[SCM] Debian packaging of libyaml-syck-perl branch, master, updated. debian/1.19-1-2-g91957bb

gregor herrmann gregoa at debian.org
Thu Dec 15 19:30:22 UTC 2011


The following commit has been merged in the master branch:
commit 91957bbaf9b4c4165f07d8dc5582f4c8e10fa6bb
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Dec 15 20:29:41 2011 +0100

    Fix license names in debian/copyright.
    
    Thanks: Cédric Boutillier for the bug report
    Closes: #652181

diff --git a/debian/copyright b/debian/copyright
index b6a05af..b87bf92 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,12 @@ Name: YAML-Syck
 
 Files: *
 Copyright: 2005-2009, Audrey Tang <cpan at audreyt.org>
-License: MIT
+License: Expat
 
 Files: *.c, *.h
 Copyright: 2003, "why the lucky stiff"
-License: BSD or Death and Repudiation
+License: Expat or Death and Repudiation
+Comment: MIT/Expat was wrongly named BSD by upstream
 
 Files: ppport.h
 Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
@@ -59,7 +60,7 @@ License: GPL-1+
  On Debian systems, the complete text of version 1 of the
  General Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
-License: MIT
+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
@@ -78,24 +79,6 @@ License: MIT
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: BSD
- 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 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: Death and Repudiation
  This software may not be used directly by any living being. ANY use of this
  software (even perfectly legitimate and non-commercial uses) until after death

-- 
Debian packaging of libyaml-syck-perl



More information about the Pkg-perl-cvs-commits mailing list