[SCM] qtcreator packaging branch, master, updated. debian/3.6.0-1-6-ga19b780

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 3e64a98d0885f1d88a2e223b6ae48bb5fa68bc7c
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 26 14:44:50 2016 -0600

    Remove unused/unnecessary jquery replacement
---
 debian/changelog | 3 +++
 debian/rules     | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eea7fe2..8df9ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtcreator (3.6.0-2) UNRELEASED; urgency=medium
   * Move libexec executables out from under /usr/bin to under /usr/lib and
     point QtCreator's internal libexec path to the new location. This
     allows plugins like Clangbackend to function once more. (closes: #812531)
+  * debian/rules:
+      + remove obsolete jQuery-related link and cleanup, since we no longer
+        ship +fdsg version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Jan 2016 15:03:51 -0600
 
diff --git a/debian/rules b/debian/rules
index 68b1a03..23f404a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,12 +24,6 @@ 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
-	mkdir -p src/shared/qbs/doc/templates/scripts
-	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/titlecase/jquery.js
-
 	mkdir -p builddir
 	cd builddir ; \
 		qmake -recursive QMAKE_CFLAGS_RELEASE="$(QMAKE_CFLAGS_RELEASE)" \
@@ -71,9 +65,6 @@ override_dh_auto_clean:
 	find . -type d -name '.obj' | xargs rm -rf
 	find . -type d -name '.rcc' | xargs rm -rf
 	find . -type d -name '.uic' | xargs rm -rf
-	rm -vf tests/manual/appwizards/htmlimportscenario_01/jquery-1.5.min.js
-	rm -vf src/shared/qbs/doc/templates/scripts/jquery.js
-	rm -vf doc/titlecase/jquery.js
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qtcreator packaging