[SCM] qtwebchannel packaging branch, master, updated. 5e8b05cb8101d0cc2e351ecf98805d0b7299fa07

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fad807b53310396bfd66d02f61572a8f35912424
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jul 4 10:37:52 2016 +0200

    debian/rules: Drop special rules till they are required
---
 debian/rules | 72 +++---------------------------------------------------------
 1 file changed, 3 insertions(+), 69 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9bc9a3c..01ca3ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,85 +8,19 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-gstab_architectures := amd64 i386 powerpc s390x
-fulldebug_architectures := none
-disabled_jit_architectures := armel mips mipsel
-disabled_pch_architectures := amd64 powerpc s390x
-
-debian_version = $(shell dpkg-parsechangelog -SVersion)
-upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
-upstream_version = $(firstword $(subst +, ,$(debian_version)))
-
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	# Run qmake once to create .qmake.conf and be sure to append the following values.
-	qmake
-
-# Enable gstabs debugging symbols only on gstab_architectures.
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
-	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
-	echo "QMAKE_CXXFLAGS += -gstabs" >> .qmake.conf
-# Enable normal debugging symbols only on fulldebug_architectures.
-else ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(fulldebug_architectures)))
-	echo "QMAKE_CXXFLAGS += -g" >> .qmake.conf
-else
-# Disable debugging symbols in all the other archs.
-	echo "QMAKE_CXXFLAGS -= -g" >> .qmake.conf
-	echo "QMAKE_CXXFLAGS -= -gstabs" >> .qmake.conf
-endif
-
-# Disable JIT on selected architectures
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_jit_architectures)))
-	echo "QMAKE_CXXFLAGS += -DENABLE_JIT=0" >> .qmake.conf
-endif
-
-# Disable header precompliation as it creates invalid includes on certain
-# architectures causing build failure. LP: 1395661
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectures)))
-	echo "CONFIG -= precompile_header" >> .qmake.conf
-endif
-
-	# Run qmake again now with the proper values.
-	qmake
-
-	# Upstream 5.6.0 RC tarball was generated improperly and has no synced headers
-	/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version)
-	
-override_dh_auto_build-indep:
-# 	dh_auto_build -- sub-Source-QtWebChannel-pro-clean
-# 	dh_auto_build -- -CSource -fMakefile.api docs
+	qmake QT_BUILD_PARTS+=" src"
 
 override_dh_auto_install-arch:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
-# 	
-# 	# Remove rpath from the offending binaries
-# 	chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/libexec/QtWebProcess
-# 	chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/libexec/QtWebPluginProcess
-	
-	# Fix wrong path in pkgconfig files
-	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
-	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
-	
+
 	# Remove private headers
 	rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebChannel/*/QtQtWebChannel
-	rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebChannelWidgets/*/QtWebChannelWidgets
 	# And associated files
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webchannel_private.pri
-	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webchannelwidgets_private.pri
-	
+
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
-
-override_dh_auto_install-indep:
-#	dh_auto_build -- -CSource -fMakefile.api INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
-
-override_dh_install:
-	dh_install --fail-missing
-
-override_dh_auto_test:
-	# Do not attempt to run anything to make build-indep work

-- 
qtwebchannel packaging