[SCM] qtwebengine packaging branch, master, updated. ac4132ac21684970f049f090891b9675d6615840

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=769aad9

The following commit has been merged in the master branch:
commit 769aad9c876ea8ee3b0b018364c3a7a7f16379e6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 8 13:53:09 2016 +0200

    Drop the min.js files from the examples
---
 debian/control | 12 ++++--------
 debian/rules   |  7 +++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index b19ae95..4dba2a1 100644
--- a/debian/control
+++ b/debian/control
@@ -91,8 +91,7 @@ Description: Web content engine library for Qt - development files
 Package: libqt5webengine5
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Web content engine library for Qt
  QtWebEngine provides a Web browser engine that makes it easy to embed content
@@ -103,8 +102,7 @@ Description: Web content engine library for Qt
 Package: qml-module-qtwebengine
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Qt WebEngine QML module
  QtWebEngine provides a Web browser engine that makes it easy to embed content
@@ -115,8 +113,7 @@ Description: Qt WebEngine QML module
 Package: qt5webengine-examples
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libjs-jquery, libjs-marked, ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Qt WebEngine - Examples
  QtWebEngine provides a Web browser engine that makes it easy to embed content
@@ -129,8 +126,7 @@ Architecture: amd64 i386 powerpc s390x
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: libqt5webengine5 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: libqt5webengine5 (= ${binary:Version}), ${misc:Depends}
 Description: Web content engine library for Qt - debugging symbols
  QtWebEngine provides a Web browser engine that makes it easy to embed content
  from the World Wide Web into your Qt application.
diff --git a/debian/rules b/debian/rules
index e817432..5f696a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,5 +109,12 @@ override_dh_auto_install-indep:
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_link:
+	dh_link --prckage=qt5webengine-examples \
+		usr/share/javascript/jquery/jquery.min.js usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webenginewidgets/contentmanipulation/jquery.min.js \
+		usr/share/javascript/marked/marked.min.js usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webenginewidgets/markdowneditor/resources/marked.min.js
+	
+	dh_link --remaining-packages
+
 #override_dh_auto_test:
 	# Do not attempt to run anything to make build-indep work

-- 
qtwebengine packaging