[SCM] qtbase packaging branch, master, updated. 342267fffe8c5a37b0ba03bcd3733f85ddbea7b7

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 342267fffe8c5a37b0ba03bcd3733f85ddbea7b7
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Sun Jan 6 16:06:39 2013 +0200

    More copyright update
    Prepare upload for experimental
---
 debian/changelog |    2 +-
 debian/copyright |   15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 448657f..e78b386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtbase-opensource-src (5.0.0-1) UNRELEASED; urgency=low
+qtbase-opensource-src (5.0.0-1) experimental; urgency=low
 
   * Initial release. (Closes: #697509)
 
diff --git a/debian/copyright b/debian/copyright
index b4a98ba..fee067b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -252,7 +252,7 @@ License: Zlib
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
-License: LGPL-2.1 with Nokia Qt LGPL Exception 1.1
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
  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
@@ -261,14 +261,14 @@ License: LGPL-2.1 with Nokia Qt LGPL Exception 1.1
  General Public License version 2.1 requirements will be met:
  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
  .
- In addition, as a special exception, Nokia gives you certain additional
- rights. These rights are described in the Nokia Qt LGPL Exception
+ In addition, as a special exception, Digia gives you certain additional
+ rights. These rights are described in the Digia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public License
  can be found in `/usr/share/common-licenses/LGPL-2.1`.
  .
- Nokia Qt LGPL Exception version 1.1:
+ Digia 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
@@ -313,10 +313,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-     the names of its contributors may be used to endorse or promote
-     products derived from this software without specific prior written
-     permission.
+   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+     of its contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-- 
qtbase packaging