rev 13986 - in trunk/packages/qt-creator/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-03-05 08:50:53 +0000 (Thu, 05 Mar 2009)
New Revision: 13986

Removed:
   trunk/packages/qt-creator/debian/patches/kubuntu_01_no_docs.diff
Modified:
   trunk/packages/qt-creator/debian/copyright
   trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff
Log:
Update copyright.
Remove kubuntu patch from repo.


Modified: trunk/packages/qt-creator/debian/copyright
===================================================================
--- trunk/packages/qt-creator/debian/copyright	2009-03-05 07:26:26 UTC (rev 13985)
+++ trunk/packages/qt-creator/debian/copyright	2009-03-05 08:50:53 UTC (rev 13986)
@@ -6,7 +6,7 @@
     Jonathan Riddell <jriddell at ubuntu.com>
     on Sun, 18 Jan 2009 14:42:22 +0100
 
-It was downloaded from :
+It was downloaded from:
 
     http://www.qtsoftware.com
 
@@ -18,30 +18,73 @@
 
     © 2008-2009 Nokia Corporation and/or its subsidiary(-ies)
 
+Copyright for Open Source front-end for C++, enhanced for use in Qt Creator:
+
+    src/libs/cplusplus/Macro.cpp
+    src/libs/cplusplus/Macro.h
+    src/libs/cplusplus/PreprocessorEnvironment.cpp
+    src/libs/cplusplus/PreprocessorEnvironment.h
+    src/libs/cplusplus/pp-cctype.h
+    src/libs/cplusplus/pp-engine.cpp
+    src/libs/cplusplus/pp-engine.h
+    src/libs/cplusplus/pp-macro-expander.h
+    src/libs/cplusplus/pp-scanner.cpp
+    src/libs/cplusplus/pp-scanner.h
+    src/libs/cplusplus/pp.h
+    src/shared/cplusplus/* excluding:
+    - src/shared/cplusplus/Array.cpp
+    - src/shared/cplusplus/LiteralTable.cpp
+    - src/shared/cplusplus/ObjectiveCAtKeywords.cpp
+    - src/shared/cplusplus/PrettyPrinter.cpp
+    - src/shared/cplusplus/PrettyPrinter.h
+
+    © 2005, 2008 Roberto Raggi <roberto.raggi at gmail.com>
+
+    MIT License
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
 License:
 
+    Commercial Usage
+
+    Licensees holding valid Qt Commercial licenses may use this file in
+    accordance with the Qt Commercial License Agreement provided with the
+    Software or, alternatively, in accordance with the terms contained in
+    a written agreement between you and Nokia.
+
     GNU Lesser General Public License Usage
 
-    this file may be used under the terms of the GNU Lesser
+    Alternatively, 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 file.  Please review the following information to
     ensure the GNU Lesser General Public License version 2.1 requirements
     will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 
-    Nokia Qt LGPL Exception version 1.0
+    In addition, as a special exception, Nokia gives you certain additional
+    rights. These rights are described in the Nokia Qt LGPL Exception
+    version 1.0, included in the file LGPL_EXCEPTION.txt in this package.
 
-    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.
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-On Debian systems the LGPL is at /usr/share/common-licenses/LGPL
-    
 The Debian packaging is:
 
     © 2009, Adam Majer <adamm at zombino.com>
@@ -49,4 +92,15 @@
     © 2009, Jeremy Lainé <jeremy.laine at m4x.org>
     © 2009, Jonathan Riddell <jriddell at ubuntu.com>
 
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
\ No newline at end of file
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+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.

Modified: trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff
===================================================================
--- trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff	2009-03-05 07:26:26 UTC (rev 13985)
+++ trunk/packages/qt-creator/debian/patches/02_remove_qtcreator_rpath.diff	2009-03-05 08:50:53 UTC (rev 13986)
@@ -1,9 +1,9 @@
 --- a/src/app/app.pro
 +++ b/src/app/app.pro
 @@ -28,8 +28,6 @@ DESTDIR = ../../bin
-
+ 
  SOURCES += main.cpp
-
+ 
 -include(../rpath.pri)
 -
  win32 {

Deleted: trunk/packages/qt-creator/debian/patches/kubuntu_01_no_docs.diff