[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.16+dfsg-1-1-g62efaf8

[Julian Taylor]

The following commit has been merged in the master branch:
commit 62efaf8f702d3ec5e303b72d79d7d8a2530727dc
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Sep 18 23:15:30 2011 +0200

    debian/copyright: fix dep-5 syntax errors and wrong license tags
    
    some icons where wrongly marked as GPL-2 but are GPL-2+

diff --git a/debian/changelog b/debian/changelog
index 3069329..90748d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.16+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/copyright: fix dep-5 syntax errors and wrong license tags
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 18 Sep 2011 23:14:54 +0200
+
 keepass2 (2.16+dfsg-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index 9e12d06..08a1194 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ 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, listing in debian/README.source
 
 Files: *
-Copyright (C) 2003-2011 Dominik Reichl
+Copyright: 2003-2011 Dominik Reichl
 License: GPL-2+
 
 Files: KeePassLibSD/*
@@ -30,11 +30,11 @@ License: LGPL-2.1withAddon
 Files: KeePass/Resources/Images/B16x16_Imp_KeePassX.png
 Copyright: 2005-2008, Tarek Saidi
            2007-2009, Felix Geyer
-License: GPL-2
+License: GPL-2+
 
 Files: KeePass/Resources/Icons/*  KeePass/KeePass.ico KeePass/Resources/Images Translation/TrlUtil/Resources/KeePass.ico
 Copyright: 2011, Christopher Bolin
-License: GPL-2
+License: GPL-2+
 
 Files: KeePassLibSD/BouncyCastle/*
 Copyright: 2000-2010, The Legion Of The Bouncy Castle (http://www.bouncycastle.org)

-- 
keepass2