[SCM] qt5webkit packaging branch, experimental, updated. debian/5.6.1+dfsg-4-6-g2bf94fe

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Jul 5 18:19:33 UTC 2016


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

The following commit has been merged in the experimental branch:
commit 2bf94fe840cd91c8b783ea263177cdfacb8f490f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 5 21:19:29 2016 +0300

    Drop the syncqt hack, the new tarballs are generated properly.
---
 debian/changelog | 1 +
 debian/rules     | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa10aa7..e6d4fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwebkit-opensource-src (5.7.0+dfsg-1) UNRELEASED; urgency=medium
   * Refresh no_gc_sections.diff.
   * Bump Qt build-dependencies to 5.7.0.
   * Update the symbols files from 5.6.1 build logs.
+  * Drop the syncqt hack, the new tarballs are generated properly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jul 2016 16:25:01 +0300
 
diff --git a/debian/rules b/debian/rules
index 492fe74..f591ca7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,6 @@ 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 --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
 
@@ -54,9 +50,6 @@ 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-QtWebKit-pro-clean
 	dh_auto_build -- -CSource -fMakefile.api docs

-- 
qt5webkit packaging



More information about the pkg-kde-commits mailing list