[SCM] qtlocation packaging branch, experimental, updated. debian/5.9.1+dfsg-2-6-g0f3636a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 68e42cafb24c424eae3c9883746d2bea574ea216
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 15 12:07:49 2017 +0300

    Use Files-Excluded instead of custom repacking code.
    
    Upstream updated mapbox-gl-native submodule, the new version contains
    less files.
---
 debian/changelog | 1 +
 debian/copyright | 1 +
 debian/rules     | 6 ------
 debian/watch     | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64392b8..5e3103f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtlocation-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.9.2.
+  * Use Files-Excluded instead of custom repacking code.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Oct 2017 11:54:20 +0300
 
diff --git a/debian/copyright b/debian/copyright
index eb1372d..cca6425 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtlocation-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
+Files-Excluded: src/3rdparty/mapbox-gl-native
 
 Files: *
 Copyright: 2015-2016 The Qt Company Ltd.
diff --git a/debian/rules b/debian/rules
index aedd890..28dc3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,9 +75,3 @@ 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
-	xz -dc ../qtlocation-opensource-src-$(UPSTREAM_VERSION).tar.xz | \
-		tar --delete qtlocation-opensource-src-$(UPSTREAM_VERSION)/src/3rdparty/mapbox-gl-native | \
-		xz -z > ../qtlocation-opensource-src_$(UPSTREAM_VERSION)+dfsg.orig.tar.xz
diff --git a/debian/watch b/debian/watch
index 0ad0996..3718644 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
 https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtlocation-opensource-src-([^-]*)\.tar\.xz

-- 
qtlocation packaging