[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.1.0-2-6-g58ef110

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 52e0dd6596bd04777edd839a02f8eb0b45cb0a95
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Oct 20 11:54:41 2013 -0300

    Use a fake file for allowing proper building.
    
    Then replace it for a symlink to the system's lib.
---
 debian/changelog |    6 +++++-
 debian/rules     |    8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf01d5f..1e49407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ qtwebkit-examples-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
     (Closes: #723035).
     - Repackage source tarball and add +dfsg to the version.
     - Add prune-nonfree to debian/rules to remove non free stuff.
-    - Modify debian/rules to not delete the file we are not shipping.
+    - Modify debian/rules:
+      - Create a fake jquery.min.js. The build system needs to find it in order
+        to be able to install it.
+      - Once things are installed, remove the fake file and replace it with a
+        symlink to the system provided one.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Oct 2013 10:57:52 -0300
 
diff --git a/debian/rules b/debian/rules
index dd1aedc..c8769f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,11 @@ export QT_SELECT := qt5
 	dh $@ --dbg-package=qtwebkit5-examples-dbg --with pkgkde_symbolshelper --parallel
 
 override_dh_auto_configure:
-	qmake 
+	qmake
+	# The build system needs to find the file but doesn't seems to use it later
+	# as part of the build process. We create a fake one and will replace it later
+	# for the system-provided one.
+	touch $(CURDIR)/examples/webkitwidgets/fancybrowser/jquery.min.js
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -24,6 +28,8 @@ override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_install-arch:
+	# We will replace the fake 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
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ \
 		-perm /u+x,g+x,o+x -type f \

-- 
qtwebkit-examples packaging