[SCM] qtenginio packaging branch, master, updated. debian/5.3.1-2-3-gcca99d1

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Sun Sep 14 10:26:29 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtenginio.git;a=commitdiff;h=cca99d1

The following commit has been merged in the master branch:
commit cca99d1ff97b56d2c6193c6c1ebe8c31e31d5b05
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Sep 14 14:25:40 2014 +0400

    Use correct exception syntax in debian/copyright.
    
    According to the specification (and to Lintian), the syntax is:
    
        short-license-name with exception-name exception
    
    In our case it will be:
    
        LGPL-2.1 with Digia-1.1 exception
---
 debian/changelog | 1 +
 debian/copyright | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23ad237..d1ba751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtenginio-opensource-src (5.3.1-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update my e-mail address.
+  * Use correct exception syntax in debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Sep 2014 14:09:27 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 0148807..e9cb792 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://download.qt-project.org/official_releases/qt/5.3/*/submodules/
 
 Files: *
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1_with_Digia_ Qt_LGPL_Exception_1.1 or GPL-3
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
 
 Files: examples/enginio/*
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
@@ -29,7 +29,7 @@ License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General Public
  License 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
 
-License: LGPL-2.1_with_Digia_ Qt_LGPL_Exception_1.1
+License: LGPL-2.1 with Digia-1.1 exception
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 as published by the Free Software Foundation and
  appearing in the file LICENSE.LGPL included in the packaging of this

-- 
qtenginio packaging



More information about the pkg-kde-commits mailing list