[SCM] qtlocation packaging branch, experimental, updated. debian/5.7.1-1-9-g36143de

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 36143de459f409288b097d48f1239395d5c3d07f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 15 23:48:22 2017 +0300

    Remove src/3rdparty/mapbox-gl-native from the tarball.
    
    It helps us reduce source size from 57M to 3.2M and solve many
    copyright issues.
    
    Because of #855464, use custom code in debian/rules to do that.
---
 debian/changelog |  8 +++++++-
 debian/rules     | 12 ++++++++++++
 debian/watch     |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 52c8a2f..27668e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-qtlocation-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
+qtlocation-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * New upstream release.
   * Add myself to Uploaders.
   * Add libicu-dev and zlib1g-dev to build dependencies as they are now
     used by upstream.
   * Install new upstream files.
 
+  [ Dmitry Shachnev ]
+  * Remove src/3rdparty/mapbox-gl-native from the tarball. It helps us
+    reduce source size from 57M to 3.2M and solve many copyright issues.
+    Because of #855464, use custom code in debian/rules to do that.
+
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Sat, 10 Jun 2017 21:25:01 -0500
 
 qtlocation-opensource-src (5.7.1-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 13c2367..f081d08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,9 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+DEBIAN_VERSION = $(shell dpkg-parsechangelog -Sversion)
+UPSTREAM_VERSION = $(firstword $(subst +, ,$(DEBIAN_VERSION)))
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
 
@@ -65,3 +68,12 @@ override_dh_auto_clean:
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='qtlocation5-dbg (<< 5.7.0-1~), qtpositioning5-dbg (<< 5.5.0-1~)'
+
+get-orig-source:
+	uscan --noconf --download-current-version --no-symlink
+	cd ..; rm -rf qtlocation-opensource-src-$(UPSTREAM_VERSION)
+	cd ..; tar xJf qtlocation-opensource-src-$(UPSTREAM_VERSION).tar.xz
+	rm -rf ../qtlocation-opensource-src-$(UPSTREAM_VERSION)/src/3rdparty/mapbox-gl-native/
+	cd ../qtlocation-opensource-src-$(UPSTREAM_VERSION)/src; touch -r imports 3rdparty
+	cd ..; tar -cJf qtlocation-opensource-src_$(UPSTREAM_VERSION)+dfsg.orig.tar.xz \
+		--owner=root --group=root --mode=a+rX qtlocation-opensource-src-$(UPSTREAM_VERSION)/
diff --git a/debian/watch b/debian/watch
index c8c35bd..0ad0996 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtlocation-opensource-src-([^-]*)\.tar\.xz

-- 
qtlocation packaging