[SCM] signon-ui packaging branch, master, updated. 255d373531da54d0a5023be0512ee1a8653b6911

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/signon-ui.git;a=commitdiff;h=445cf3d

The following commit has been merged in the master branch:
commit 445cf3ddfdc980e66ed66c429897ffbf553f8cb0
Author: Diane Trout <diane at ghic.org>
Date:   Mon Sep 14 23:06:38 2015 -0700

    Add LGPL-2.1-QTexception-1.1 text to debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 33 +++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce55f52..54ab8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ signon-ui (0.17+15.10.20150810-1) UNRELEASED; urgency=medium
   * Remove Breaks/Replaces from signon-ui-service as we have never been
     released to Debian
   * Add watch file
+  * Add LGPL-2.1-QTexception-1.1 text to debian/copyright
 
  -- Diane Trout <diane at debian.org>  Mon, 14 Sep 2015 22:06:53 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 0d4a607..a4b8a7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -68,19 +68,24 @@ License: GPL-3
  On Debian systems, the complete text of the GNU General Public License
  version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+License: LGPL-2.1-QTexception-1.1
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library.  You may distribute
+ such object code under terms of your choice, provided that:
+     (i)   the header files of the Library have not been modified; and
+     (ii)  the incorporated material is limited to numerical parameters, data
+           structure layouts, accessors, macros, inline functions and
+           templates; and
+     (iii) you comply with the terms of Section 6 of the GNU Lesser General
+           Public License version 2.1.
  .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
  .
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.

-- 
signon-ui packaging