[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-3-21-gea02964

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ea029649fac5b40c3b3c3ccee6e72b7799d3fe16
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 6 20:27:15 2016 +0300

    When merging install files, take DEB_HOST_ARCH_CPU into account.
    
    This is much more useful for us, because it allows us not to ship identical
    files for i386, hurd-i386 and kfreebsd-i386.
---
 debian/changelog                          |  3 +++
 debian/libqt5core5a.install-hurd-i386     |  1 -
 debian/libqt5core5a.install-kfreebsd-i386 |  1 -
 debian/libqt5gui5.install-hurd-i386       |  1 -
 debian/libqt5gui5.install-kfreebsd-i386   |  1 -
 debian/rules                              | 10 +++++-----
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45c1f33..b5feb0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ qtbase-opensource-src (5.6.0~beta+dfsg-4) UNRELEASED; urgency=medium
   * Use wildcards instead of hardcoded ABI versions in Lintian overrides files.
   * Merge 5.5.1+dfsg-11 and 5.5.1+dfsg-12 unstable uploads.
     - Refresh patches.
+  * When merging install files, take DEB_HOST_ARCH_CPU into account, instead of
+    DEB_HOST_ARCH. This is much more useful for us, because it allows us not to
+    ship identical files for i386, hurd-i386 and kfreebsd-i386.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2016 21:05:06 +0300
 
diff --git a/debian/libqt5core5a.install-hurd-i386 b/debian/libqt5core5a.install-hurd-i386
deleted file mode 100644
index dff78b8..0000000
--- a/debian/libqt5core5a.install-hurd-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Core.so.*
diff --git a/debian/libqt5core5a.install-kfreebsd-i386 b/debian/libqt5core5a.install-kfreebsd-i386
deleted file mode 100644
index dff78b8..0000000
--- a/debian/libqt5core5a.install-kfreebsd-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Core.so.*
diff --git a/debian/libqt5gui5.install-hurd-i386 b/debian/libqt5gui5.install-hurd-i386
deleted file mode 100644
index 4732aad..0000000
--- a/debian/libqt5gui5.install-hurd-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Gui.so.*
diff --git a/debian/libqt5gui5.install-kfreebsd-i386 b/debian/libqt5gui5.install-kfreebsd-i386
deleted file mode 100644
index 4732aad..0000000
--- a/debian/libqt5gui5.install-kfreebsd-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Gui.so.*
diff --git a/debian/rules b/debian/rules
index 809854d..8654072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,8 @@ upstream_changes := dist/changes-$(shell dpkg-parsechangelog | sed -n 's/^Versio
 # Distribution vendor
 vendor := $(shell dpkg-vendor --query Vendor)
 
-# To easier the files installation according OSes and archs, we create three
-# kinds of install files: foo.install-common, foo.install-$DEB_HOST_ARCH and
+# To easier the files installation according to OSes and CPUs, we create three
+# kinds of install files: foo.install-common, foo.install-$DEB_HOST_ARCH_CPU and
 # foo.install-$DEB_HOST_ARCH_OS. In this case we can fine-tune what we install.
 #
 # Note that if any foo.install-* file exists and foo.install exist too, the
@@ -31,8 +31,8 @@ vendor := $(shell dpkg-vendor --query Vendor)
 
 # Retrieve packages that have a .install-common file
 pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
-# Retrieve packages that have a .install-$DEB_HOST_ARCH file
-pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH)))
+# Retrieve packages that have a .install-$DEB_HOST_ARCH_CPU file
+pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH_CPU),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_CPU)))
 # Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
 pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
 
@@ -304,7 +304,7 @@ override_dh_install:
 	done
 
 	set -e; for pkg in $(pkgs_with_arch); do \
-		cat debian/$$pkg.install-$(DEB_HOST_ARCH) >> debian/$$pkg.install ; \
+		cat debian/$$pkg.install-$(DEB_HOST_ARCH_CPU) >> debian/$$pkg.install ; \
 	done
 
 	set -e; for pkg in $(pkgs_with_os); do \

-- 
qtbase packaging