[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.7.1-20161021-2-8-gf3e98ba

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Jan 4 18:23:20 UTC 2017


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

The following commit has been merged in the master branch:
commit 497f824c6c7f6d6da671d33da4fe77fc081b49a8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 4 21:21:38 2017 +0300

    Remove the not needed jquery handling code from debian/rules.
---
 debian/rules | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index 84f2b32..e6444dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,32 +15,21 @@ export QT_SELECT := qt5
 
 override_dh_auto_configure:
 	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
 	rm -rf doc/qtwebkitexamples doc/qtwebkitexamples.qch .qmake.cache
-	rm -fv examples/webkitwidgets/fancybrowser/jquery.min.js
 
 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 -f $(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 \
                 -regex '.*\.\(app\|conf\|cpp\|h\|html\|js\|php\|png\|pro\|xml\|xsl\)$$' \
                 -exec chmod a-x {} \;
 
-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



More information about the pkg-kde-commits mailing list