[SCM] qtcreator packaging branch, master, updated. debian/3.3.0+dfsg-1-13-gfcb22e1

Fri Jun 26 03:17:16 UTC 2015

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

The following commit has been merged in the master branch:
commit 9c158a0ad0db27362138929be06f2c57a3fa945c
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jun 25 13:53:10 2015 -0500

    Update debian/copyright
    
    Update location of 3-clause BSD license to Debian common-licenses
    location.
    
    Consolidate MIT and Expat - they are the same licenses.
---
 debian/changelog |  5 ++--
 debian/copyright | 89 ++++----------------------------------------------------
 2 files changed, 8 insertions(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71ac8d0..7726ef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 qtcreator (3.4.1+dfsg-1) UNRELEASED; urgency=medium
 
-
-  [ Adam Majer ]
   * New upstream release
     + Refresh patches - only positional changes
   * Temporarily disable QBS plugin
+  * debian/copyright:
+    + consolidate 3-clause BSD licenses
+    + consolidate MIT and Expat - they are the same licenses.
 
  -- Adam Majer <adamm at zombino.com>  Wed, 24 Jun 2015 23:01:01 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 8a94f43..b2bcb89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://download.qt-project.org/official_releases/qtcreator/*/*/
+Source: http://download.qt.io/official_releases/qtcreator/*/*/
 
 Files: *
 Copyright:
@@ -36,7 +36,7 @@ License: LGPL-2.1+
 
 Files: src/shared/qbs/doc/templates/scripts/superfish.js
 Copyright: 2008 Joel Birch
-License: Expat and GPL-unspecified-version
+License: MIT or GPL-2
 
 Files:
  doc/examples/addressbook-sdk/part1/main.cpp
@@ -125,7 +125,7 @@ Copyright:
     http://pivotallabs.com/users/scoward/blog
     Eloy Duran, Fingertips <eloy at fngtps.com>
     Fawzi Mohamed, digia <fawzi.mohamed at digia.com>
-License: Expat
+License: BSD
 Comment: some entries as described in src/tools/3rdparty/iossim/IOSSIM_LICENSE
 
 License: LGPL-2.1+
@@ -184,55 +184,8 @@ License: LGPL-2.1+ with Digia exception
  modified version of the Library.
 
 License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
- .
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
- .
-   * Neither the name of the Pipelight project 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
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Expat
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- .
- 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.
+ On Debian systems, the terms of BSD-3-clause license may be found at 
+ '/usr/share/common-licenses/BSD'
 
 License: BSD-2-clause
  All rights reserved.
@@ -260,43 +213,11 @@ License: BSD-2-clause
  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- All rights reserved.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1) Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- 2) Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- 3) Neither the name of the ORGANIZATION 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 LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: GPL-unspecified-version
- Just a link to http://www.gnu.org/licenses/gpl.html
-
 License: GPL-2
  On Debian GNU/Linux systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 License: MIT
-  Copyright (c) 2011 John Resig, http://jquery.com/
-  .
   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

-- 
qtcreator packaging

