[SCM] qtwebengine packaging branch, master, updated. debian/5.7.1+dfsg-2-2-g59d624d

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 59d624dc5fd0911957cea59c34b96d71399d78fa
Author: Sandro Knauß <hefee at debian.org>
Date:   Sun Jan 8 00:35:14 2017 +0100

    Make arch=all build successfully
---
 debian/changelog |  7 +++++++
 debian/rules     | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 682c0b7..34aa80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtwebengine-opensource-src (5.7.1+dfsg-3) UNRELEASED; urgency=medium
+
+  [ Sandro Knauß ]
+  * Make arch=all build successfully
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Jan 2017 00:33:31 +0100
+
 qtwebengine-opensource-src (5.7.1+dfsg-2) experimental; urgency=medium
 
   * Fix "bad VCS links in debian/control" (Closes: #849301)
diff --git a/debian/rules b/debian/rules
index 0d6d0e0..1ca6979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,14 +104,14 @@ endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectures)))
 	echo "CONFIG -= precompile_header" >> .qmake.conf
 endif
-
+	
 	# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
 	echo "QMAKE_LFLAGS += -Wl,--no-keep-memory" >> .qmake.conf
 
 	# Run qmake again now with the proper values.
 	qmake  WEBENGINE_CONFIG+="$(defines)" QT_BUILD_PARTS+=" tests"
 
-override_dh_auto_build-arch:
+	# Create js files, that are needed for building step for arch and indep builds
 	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
 		closure-compiler --compilation_level ADVANCED_OPTIMIZATIONS \
 		--js util.js \
@@ -129,9 +129,11 @@ override_dh_auto_build-arch:
 		touch $(CURDIR)/$${fname}; \
 	done
 
+override_dh_auto_build-arch:
 	dh_auto_build
 
-override_dh_auto_build-indep:
+#we also need the resources.pak files, so we need the normal build.
+override_dh_auto_build-indep: override_dh_auto_build-arch
 	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
@@ -158,9 +160,10 @@ override_dh_auto_install-arch:
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 override_dh_auto_install-indep:
+	dh_auto_install -i
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
-override_dh_install:
+override_dh_install-arch:
 	dh_install --fail-missing
 
 override_dh_link:

-- 
qtwebengine packaging