[SCM] qtwebchannel packaging branch, master, updated. 494f008b2cb64f9dc936543f5ba21b7e65768226

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Aug 27 16:31:26 UTC 2016


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

The following commit has been merged in the master branch:
commit 2cb2e4fee751372604bd7ece33ebae4911d19300
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 27 18:57:51 2016 +0300

    Make the symlinks relative, as per Policy 10.5.
    
    Also, use ln -f flag instead of a separate rm call.
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 411a998..515810d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,10 +38,8 @@ override_dh_auto_install-arch:
 	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
+	ln -sf ../chatclient-html/qwebchannel.js debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/nodejs/qwebchannel.js
+	ln -sf ../chatclient-html/qwebchannel.js debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/qwclient/qwebchannel.js
 
 override_dh_auto_test-indep:
 

-- 
qtwebchannel packaging



More information about the pkg-kde-commits mailing list