[SCM] Repository for the KDE Debconf access library. branch, master, updated. debian/0.1+git20110702-1-17-g02bee50

[Matthias Klumpp]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/debconf-kde.git;a=commitdiff;h=02bee50

The following commit has been merged in the master branch:
commit 02bee50727ef8a81847bed6f022d39b0e69627b7
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Tue Apr 3 23:36:11 2012 +0200

    Update debian/copyright
---
 debian/copyright |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0669183..4a185bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,8 +13,7 @@ Files: src/DebconfGui.h
        src/debconf.cpp
 Copyright: 2008, Petr Rockai <me at mornfall.net>
            2010, Daniel Nicoletti <dantti85-pk at yahoo.com.br>
-License: LGPL-2+
-         BSD
+License: LGPL-2+ or BSD-3-clause
  Parts of these files which were written by Petr Rockai are
  licensed under BSD, parts written by Daniel Nicoletti are LGPL-2+
 
@@ -24,7 +23,7 @@ License: GPL-2+
  On Debian systems the full text of the GNU General Public License can be found
  in the '/usr/share/common-licenses/GPL-2' file.
 
-License: BSD
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:

-- 
Repository for the KDE Debconf access library.