[SCM] qtcreator packaging branch, experimental, updated. debian/3.2.0+dfsg-2-2-gc83e692

[Adam Majer]

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

The following commit has been merged in the experimental branch:
commit c83e692d66044ec9d44c95c289754472083c2167
Author: Adam Majer <adamm at zombino.com>
Date:   Fri Sep 19 17:00:58 2014 -0500

    Replace upstream's JQuery with Debian version
    
    Upstream tarball contains a few instances of JQuery. There are
    replaced with latest version of non-minified JQuery from Debian
    keeping upstream tarball usable on standalone basis.
---
 debian/changelog |  6 ++++--
 debian/copyright | 40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5076904..048e3c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-qtcreator (3.2.1-1) UNRELEASED; urgency=medium
+qtcreator (3.2.1+dfsg-1) experimental; urgency=medium
 
   * New upstream release
+      + upstream tarball references to minified JQuery replaced with
+        latest, editing friendly version from Debian.
   * Bump all Qt dependencies to 5.3.2
 
- -- Adam Majer <adamm at zombino.com>  Fri, 19 Sep 2014 11:34:05 -0500
+ -- Adam Majer <adamm at zombino.com>  Fri, 19 Sep 2014 17:13:48 -0500
 
 qtcreator (3.2.0+dfsg-2) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 184ea22..8a94f43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://download.qt-project.org/official_releases/qtcreator/*/*/
-Files-Excluded:
-  tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
-  src/shared/qbs/doc/templates/scripts/jquery.js
-  doc/templates/scripts/jquery.js
-  doc/titlecase/jquery.js
 
 Files: *
 Copyright:
@@ -84,6 +79,15 @@ Files:
 Copyright: 2014 Digia Plc and/or its subsidiary(-ies).
 License: BSD-3-clause
 
+Files: tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
+ src/shared/qbs/doc/templates/scripts/jquery.js
+ doc/templates/scripts/jquery.js
+ doc/titlecase/jquery.js
+Copyright:
+    2011 John Resig
+    2011 The Dojo Foundation
+License: GPL-2 or MIT
+
 Files: src/libs/3rdparty/cplusplus/*
 Copyright:
     2008 Roberto Raggi <roberto.raggi at gmail.com>
@@ -285,3 +289,29 @@ License: BSD-3-clause
 
 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
+  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.

-- 
qtcreator packaging