[SCM] nepomuk-core packaging branch, kde4.11, updated. debian/4.11.2-4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/nepomuk-core.git;a=commitdiff;h=95d6190

The following commit has been merged in the kde4.11 branch:
commit 95d6190db3b2ec27ed7980f2d8990c32a7049464
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Oct 6 17:09:20 2013 +0200

    Update install files.
---
 debian/changelog                          |    6 ++++++
 debian/nepomuk-core-runtime.install       |    3 ---
 debian/nepomuk-core-runtime.install.linux |    3 +++
 debian/rules                              |    9 +++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30f0490..86a8dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nepomuk-core (4:4.11.2-3) UNRELEASED; urgency=low
+
+  * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 06 Oct 2013 17:36:37 +0200
+
 nepomuk-core (4:4.11.2-2) experimental; urgency=low
 
   * Bump kdelibs5-dev build-dependency.
diff --git a/debian/nepomuk-core-runtime.install b/debian/nepomuk-core-runtime.install
index 1662ff4..3186535 100644
--- a/debian/nepomuk-core-runtime.install
+++ b/debian/nepomuk-core-runtime.install
@@ -1,4 +1,3 @@
-etc/dbus-1/system.d/org.kde.nepomuk.filewatch.conf
 usr/bin/nepomuk2-rcgen
 usr/bin/nepomukbackup
 usr/bin/nepomukcleaner
@@ -25,5 +24,3 @@ usr/lib/kde4/nepomukpopplerextractor.so
 usr/lib/kde4/nepomuktaglibextractor.so
 usr/lib/libkdeinit4_nepomukserver.so
 usr/lib/libnepomukcommon.so
-usr/share/dbus-1/system-services/org.kde.nepomuk.filewatch.service
-usr/share/polkit-1/actions/org.kde.nepomuk.filewatch.policy
diff --git a/debian/nepomuk-core-runtime.install.linux b/debian/nepomuk-core-runtime.install.linux
new file mode 100644
index 0000000..de63f7c
--- /dev/null
+++ b/debian/nepomuk-core-runtime.install.linux
@@ -0,0 +1,3 @@
+etc/dbus-1/system.d/org.kde.nepomuk.filewatch.conf
+usr/share/dbus-1/system-services/org.kde.nepomuk.filewatch.service
+usr/share/polkit-1/actions/org.kde.nepomuk.filewatch.policy
diff --git a/debian/rules b/debian/rules
index 7ca6352..187140e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DKDE4_BUILD_TESTS=false
@@ -18,6 +19,14 @@ override_dh_shlibdeps:
 override_dh_strip:
 	$(overridden_command) --dbg-package=nepomuk-core-dbg
 
+pkgs_with_install_linux = $(patsubst debian/%.install.linux,%,$(wildcard debian/*.install.linux))
+override_dh_install:
+	$(overridden_command)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	# Also install common files in place of debian/*.install.linux variants
+	dh_install $(foreach p,$(pkgs_with_install_linux),-p$p --ignore=debian/$p.install.linux)
+endif
+
 # Library stuff
 libpkgs_addsubst_allLibraries = nepomuk-core-dev nepomuk-core-dbg
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)

-- 
nepomuk-core packaging