[SCM] qtwebkit-examples packaging branch, master, updated. 447dc162a6634ba6556c84766705c116a463a9fd

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=447dc16

The following commit has been merged in the master branch:
commit 447dc162a6634ba6556c84766705c116a463a9fd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 29 20:02:42 2013 +0400

    Replace jquery.min.js with a symbolic link to a packaged version.
---
 debian/control |    2 +-
 debian/rules   |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 768d23f..d8bb07d 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Architecture: any
 Multi-Arch: same
 Section: x11
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libjs-jquery, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 webkit examples
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/rules b/debian/rules
index dedbc05..aca0f1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,14 @@ override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install-arch:
+	# We will replace jquery.min.js with a symbolic link to a packaged version.
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webkitwidgets/fancybrowser/jquery.min.js
 	dh_auto_install
-	
+
+override_dh_link:
+	dh_link -p qtwebkit5-examples /usr/share/javascript/jquery/jquery.min.js \
+		usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webkitwidgets/fancybrowser/jquery.min.js
+
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 

-- 
qtwebkit-examples packaging