[SCM] qtwebchannel packaging branch, master, updated. 79b42daf2dc6cab23a62bbd130bd2b818d8b3eae

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Jul 28 10:18:50 UTC 2016


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

The following commit has been merged in the master branch:
commit c6afdc53e4ac6fafbbd895d87a531825116eb33f
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 12:13:03 2016 +0200

    create examples package
---
 debian/control                       | 19 ++++++++++++++++++-
 debian/libqt5webchannel-dev.install  |  1 -
 debian/qtwebchannel-examples.install |  1 +
 debian/rules                         |  6 ++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 9da0857..b481219 100644
--- a/debian/control
+++ b/debian/control
@@ -46,13 +46,30 @@ Depends: libqt5webchannel5 (= ${binary:Version}),
          qtbase5-dev,
          qtdeclarative5-dev,
          ${misc:Depends}
-Recommends: libjs-jquery, libjs-jquery-mobile, nodejs, npm
 Description: Web content engine library for Qt - development files
  Provides public API shared by both QtWebEngine and QtWebEngineWidgets
  .
  This package contains the development files needed to build Qt 5 applications
  using QtWebEngine library.
 
+Package: qtwebchannel-examples
+Architecture: any
+Multi-Arch: same
+Depends: libqt5webchannel5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libjs-jquery,
+            libjs-jquery-mobile,
+            nodejs,
+            npm
+Pre-Depends: ${misc:Pre-Depends}
+Description: Examples for Qt 5 Webchannel module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the examples for Qt5 webchannel application
+ development.
+
 Package: libqt5webchannel5
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libqt5webchannel-dev.install b/debian/libqt5webchannel-dev.install
index 95ae78d..c7c622e 100644
--- a/debian/libqt5webchannel-dev.install
+++ b/debian/libqt5webchannel-dev.install
@@ -4,5 +4,4 @@ usr/lib/*/cmake/Qt5WebChannel/Qt5WebChannelConfigVersion.cmake
 usr/lib/*/libQt5WebChannel.prl
 usr/lib/*/libQt5WebChannel.so
 usr/lib/*/pkgconfig/Qt5WebChannel.pc
-usr/lib/*/qt5/examples/webchannel/ /usr/share/doc/libqt5webchannel-dev/examples
 usr/lib/*/qt5/mkspecs/modules/qt_lib_webchannel.pri
diff --git a/debian/qtwebchannel-examples.install b/debian/qtwebchannel-examples.install
new file mode 100644
index 0000000..b3f98c2
--- /dev/null
+++ b/debian/qtwebchannel-examples.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/examples/webchannel/
diff --git a/debian/rules b/debian/rules
index 8646635..93b1fdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,12 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+	#create links
+	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/nodejs/qwebchannel.js
+	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/qwclient/qwebchannel.js
+	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/chatclient-html/qwebchannel.js  debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/nodejs/qwebchannel.js
+	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/chatclient-html/qwebchannel.js  debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/qwclient/qwebchannel.js
+
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 

-- 
qtwebchannel packaging



More information about the pkg-kde-commits mailing list