[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. upstream/2.14.dfsg-76-g6a006d9

[Julian Taylor]

The following commit has been merged in the master branch:
commit 50a27835477ec8193d75e6a59d418e21848109c2
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 10 16:35:27 2011 +0200

    update copyright
    
    add bouny castle license (MIT)

diff --git a/debian/copyright b/debian/copyright
index 1b78638..9e12d06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: KeePass2
 Upstream-Contact: Dominik Reichl <dominik.reichl at t-online.de>
-Source: http://keepass.info/ repackaged to remove icon files obtained from other password managers with non dfsg free licenses
+Source: http://keepass.info/ repackaged to remove icon files obtained from other password managers with non dfsg free licenses, listing in debian/README.source
 
 Files: *
 Copyright (C) 2003-2011 Dominik Reichl
@@ -36,8 +36,9 @@ Files: KeePass/Resources/Icons/*  KeePass/KeePass.ico KeePass/Resources/Images T
 Copyright: 2011, Christopher Bolin
 License: GPL-2
 
-
-TODO for keepass 2.15 SHA256.cs from bouncy castle, MIT license
+Files: KeePassLibSD/BouncyCastle/*
+Copyright: 2000-2010, The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+License: MIT
 
 License: GPL-2+
  This program is free software; you can redistribute it
@@ -78,7 +79,7 @@ License: LGPL-2.1withAddon
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
-
+ .
  #######**** NOTE THIS ADD-ON ****#######
  The GNU Lesser General Public License or LGPL is written for software libraries
  in the first place. The LGPL has to be considered valid for this artwork
@@ -95,3 +96,15 @@ License: LGPL-2.1withAddon
  The exception in section 6 of the GNU Lesser General Public License covers
  the use of elements of this art library in a GUI.
  dave [at] icon-king.com
+
+License: MIT
+ The Bouncy Castle License
+ Copyright (c) 2000-2010 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+ 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, sub license, 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.

-- 
keepass2