[Pkg-cli-libs-commits] [SCM] gkeyfile-sharp branch, master, updated. debian/0.1-3-2-g2cc51b3

[Iain Lane]

The following commit has been merged in the master branch:
commit 2cc51b3b6889e89a50aa6111f6f7ffcc199b25d9
Author: Iain Lane <laney at debian.org>
Date:   Mon Jul 11 23:37:09 2011 +0100

    Fix missing/incorrect copyright entries.
    
    Thanks: Michael Terry <michael.terry at canonical.com>
    Closes: #607371

diff --git a/debian/copyright b/debian/copyright
index 2e8907c..75920dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
 Name: gkeyfile-sharp-1.0
 Maintainer: Alex Launi <alex.launi at gmail.com>
-Source: http://www.gitorious.org/gkeyfile-sharp/
+Source: https://github.com/mono/gkeyfile-sharp
 
 Files: *
 Copyright: 2010 Alex Launi <alex.launi at gmail.com>
-License: LGPL-2.1+
+License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ License as published by the Free Software Foundation,
+ version 2.1 of the License.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,6 +41,28 @@ License: MIT
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Files: GKeyFile/GKeyFile.custom
+Copyright: 2008 Novell, Inc.
+License: other
+ 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.
+
 Files: debian/*
 Copyright: 2010 Chow Loong Jin <hyperair at ubuntu.com>
            2010 Didier Roche <didrocks at ubuntu.com>

-- 
gkeyfile-sharp