[SCM] kinfocenter packaging branch, master, updated. debian/5.7.4-1-7-gee3495a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kinfocenter.git;a=commitdiff;h=ee3495a

The following commit has been merged in the master branch:
commit ee3495a42a67eb477ff982a9ade0bff9ec3266a8
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 5 19:05:11 2016 +0200

    limit oui.db handling to linux
---
 debian/changelog         |  2 ++
 debian/kinfocenter.links |  1 -
 debian/rules             | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c6017c7..c5ca480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ kinfocenter (4:5.7.4-2) UNRELEASED; urgency=medium
     exist in any stable Debian release.
   * Restrict the kwayland-dev, and libraw1394-dev build dependencies as
     linux-any, so it can be built on non-Linux architectures as well.
+  * Limit the replacement of the oui.db file of the kcmview1394 module to
+    Linux, since that module is built on Linux only.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 05 Sep 2016 07:44:59 +0200
 
diff --git a/debian/kinfocenter.links b/debian/kinfocenter.links
index a5b8dce..34f1724 100644
--- a/debian/kinfocenter.links
+++ b/debian/kinfocenter.links
@@ -1,2 +1 @@
 usr/share/misc/usb.ids usr/share/kcmusb/usb.ids
-var/lib/ieee-data/kinfocenter_oui.db usr/share/kcmview1394/oui.db
diff --git a/debian/rules b/debian/rules
index 0347bd3..1784ca4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,26 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 l10npkgs_firstversion_ok := 4:4.14.0-2
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_install:
+ifeq ($(DEB_HOST_ARCH_OS),linux)
 	rm debian/kinfocenter/usr/share/kcmview1394/oui.db
+endif
 	rm debian/kinfocenter/usr/share/kcmusb/usb.ids
 	$(overridden_command)
 
 override_dh_fixperms:
 	$(overridden_command)
 	chmod 755 debian/kinfocenter/var/lib/ieee-data/update.d/kinfocenter_oui.sh
+
+override_dh_link:
+	$(overridden_command)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	dh_link /var/lib/ieee-data/kinfocenter_oui.db /usr/share/kcmview1394/oui.db
+endif

-- 
kinfocenter packaging