[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-3-19-g6a1e8c6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 24e276765ea55fab43e47f40d155c484c5c81cc8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 25 21:06:54 2014 -0300

    Build depend upon libjs-jquery and create the necessary symlinks
---
 debian/changelog | 2 ++
 debian/control   | 3 ++-
 debian/rules     | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c93e19a..606cf9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtcreator (3.0.1+dfsg-1) UNRELEASED; urgency=medium
   * Repack source excluding minified javascript files without source.
     - Use Files-excluded in debian/copyright for this.
     - Update debian/watch to mangle the dfsg version.
+    - Build depend upon libjs-jquery and create the necessary symlinks before
+      building.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Feb 2014 22:24:57 -0300
 
diff --git a/debian/control b/debian/control
index 2ee1bb2..8c67ec5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9),
                libqtwebkit-dev (>= 2.1.0~2011week13-2),
                libx11-dev,
                pkg-config,
-               qt4-dev-tools (>= 4:4.8.4+dfsg~)
+               qt4-dev-tools (>= 4:4.8.4+dfsg~),
+               libjs-jquery
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/wiki/Category:Tools::QtCreator
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtcreator.git
diff --git a/debian/rules b/debian/rules
index 415fe64..a9fdef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,12 @@ upstream_changes := $(wildcard dist/changes-*)
 	dh $@ --parallel --dbg-package=qtcreator-dbg --builddirectory=builddir
 
 override_dh_auto_configure:
+	# Create some symlinks to jquery stuff.
+	ln -s /usr/share/javascript/jquery/jquery.min.js tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
+	ln -s /usr/share/javascript/jquery/jquery.min.js src/shared/qbs/doc/templates/scripts/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.min.js doc/templates/scripts/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.min.js doc/titlecase/jquery.js
+
 	mkdir -p builddir
 	cd builddir ; \
 		qmake QMAKE_CFLAGS_RELEASE="$(QMAKE_CFLAGS_RELEASE)" \

-- 
qtcreator packaging