[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-53-g93a4007

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=93a4007

The following commit has been merged in the master branch:
commit 93a4007d34dd694d81ab3090e316d25b658334d8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 4 12:39:08 2013 -0300

    Use the system's jquery javascript library.
---
 debian/changelog          |    4 ++++
 debian/control            |    2 +-
 debian/qt4-doc-html.links |    2 +-
 debian/rules              |    4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5959414..6d58633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ qt4-x11 (4:4.8.5+dfsg-2) UNRELEASED; urgency=low
     do recursive tracking of arch dependency arch: all packages are considered
     to have the same arch as the package that depends on it. Marking this
     package as foreign solves this issue.
+  * Use the system jquery javascript library.
+    - Make libqt4-doc-html depend on libjs-jquery.
+    - Remove jquery.js from the installation.
+    - Symlink the system's jquery to the appropiate location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Jul 2013 09:59:20 -0300
 
diff --git a/debian/control b/debian/control
index eca9545..53d600c 100644
--- a/debian/control
+++ b/debian/control
@@ -855,7 +855,7 @@ Description: Qt 4 API documentation
 Package: qt4-doc-html
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery, ${misc:Depends}
 Suggests: libqt4-dev, qt-assistant-compat, w3m | www-browser | x-www-browser
 Description: Qt 4 API documentation (HTML format)
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/qt4-doc-html.links b/debian/qt4-doc-html.links
index d1fed65..d7e6563 100644
--- a/debian/qt4-doc-html.links
+++ b/debian/qt4-doc-html.links
@@ -1,2 +1,2 @@
 usr/share/qt4/doc/html usr/share/doc/qt4-doc-html/html
-
+usr/share/javascript/jquery/jquery.js usr/share/javascript/jquery/jquery.js
diff --git a/debian/rules b/debian/rules
index 4271bb0..b8c0700 100755
--- a/debian/rules
+++ b/debian/rules
@@ -324,6 +324,10 @@ override_dh_auto_install:
 	# And the gstreamer backend.
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/phonon_backend/libphonon_gstreamer.so
 
+	# Remove the embedded jquery library. We will later link to the one provided
+	# by the libjs-jquery package.
+	rm -f debian/tmp/usr/share/qt4/doc/html/scripts/jquery.js
+
 	# Add a configuration for qtchooser
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf

-- 
Qt 4 packaging