[SCM] qtlocation packaging branch, experimental, updated. debian/5.9.0+dfsg-2-8-gcdde463

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Jul 3 21:24:15 UTC 2017


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

The following commit has been merged in the experimental branch:
commit cdde4631f4f8ab02dd9ff3334c5ad0cbbe8a5d4c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 4 00:21:49 2017 +0300

    Simplify and speed up get-orig-source code by using pipes.
---
 debian/changelog | 1 +
 debian/rules     | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0592036..9960f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtlocation-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * Run all tests in Xvfb, drop disable_failing_tests.patch.
     - Add build-dependencies on xauth, xvfb and qml-module-qttest.
   * Bump Standards-Version to 4.0.0, no changes needed.
+  * Simplify and speed up get-orig-source code by using pipes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Jul 2017 22:10:54 +0300
 
diff --git a/debian/rules b/debian/rules
index aa2cbba..aedd890 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,9 +78,6 @@ override_dh_strip:
 
 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 --sort=name -cJf qtlocation-opensource-src_$(UPSTREAM_VERSION)+dfsg.orig.tar.xz \
-		--owner=root --group=root --mode=a+rX qtlocation-opensource-src-$(UPSTREAM_VERSION)/
+	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

-- 
qtlocation packaging



More information about the pkg-kde-commits mailing list