[SCM] Qt 4 Debian packaging. branch, master, updated. debian/4.5.2-2-9-ga27a7c7

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 5cdc42b1ecd99d977c3d4e382b8db0871701b8c8
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Oct 2 15:44:01 2009 +0200

    Update Nokia Qt url.
    Update Nokia Qt LGPL Exception from version 1.0 to version 1.1.
---
 debian/changelog |    3 +++
 debian/copyright |   34 +++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07a7515..8bcff2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ qt4-x11 (4:4.5.3-1) UNRELEASED; urgency=low
     - 06_CVE-2009-1725 - Merged upstream.
   * Update debian/control:
     - Switch from iodbc to unixodbc. (Closes: #548976)
+  * Update debian/copyright:
+    - Update Nokia Qt url.
+    - Update Nokia Qt LGPL Exception from version 1.0 to version 1.1.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Sep 2009 15:27:39 +0200
 
diff --git a/debian/copyright b/debian/copyright
index cd4df34..e53ca10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Brian Nelson <pyro at debian.org> on Sun, 10
 Apr 2005 21:23:49 -0700.
 
-It was downloaded from http://www.qtsoftware.com/downloads
+It was downloaded from http://qt.nokia.com/downloads
 
 Upstream Author:
 
@@ -57,13 +57,25 @@ Since Qt 4.3.4, Qt is triple licensed under the QPL, GPL 2 and GPL 3.
 Since Qt 4.3.1, a Trolltech GPL exception was added to allow linking
 against non-GPL libraries and applications:
 
-Nokia Qt LGPL Exception version 1.0
-
-As a special exception 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 the incorporated material (i) does not exceed
-more than 5% of the total size of the Library; and (ii) is limited to
-numerical parameters, data structure layouts, accessors, macros,
-inline functions and templates.
+Nokia Qt LGPL Exception version 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.
+
+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.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.

-- 
Qt 4 Debian packaging.