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

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 3943c3ae78ee387e317c8e868a4549d3fb841d31
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Aug 11 00:15:13 2011 +0800

    Trim duplicate debian/copyright entries
    
    The patch by Michael Terry (2cc51b3) added a duplicate debian/copyright stanza stating
    that GKeyFile/GKeyFile.custom was licensed under "other", rather than "MIT/X11"
    which was shown in the previous stanza.
    
    The license text and files listed in both stanzas are the same though, so I
    dropped the one with the wrong license name.
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 75920dd..f1f1111 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,28 +41,6 @@ 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