[SCM] KDE Base Runtime module packaging branch, master, updated. debian/15.08.0-2-4-g649aff7
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Sep 14 22:29:51 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=1891b84
The following commit has been merged in the master branch:
commit 1891b841e795ab44715a817a4ea4aea4dd70caa3
Author: Diane Trout <diane at ghic.org>
Date: Thu Aug 27 18:18:22 2015 -0700
* Don't build smbclient support on hurd due to Bug #190367
---
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/rules | 9 +++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 73008ab..5b3e845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-runtime (4:4.14.2-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Don't build smbclient support on hurd due to Bug #190367
+
+ -- Diane Trout <diane at debian.org> Thu, 27 Aug 2015 18:11:46 -0700
+
kde-runtime (4:4.14.2-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 1a053b4..da5cb91 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends: cmake,
libqtwebkit-dev,
libqzeitgeist-dev,
libslp-dev,
- libsmbclient-dev,
+ libsmbclient-dev [!hurd-any],
libsoprano-dev,
libssh-gcrypt-dev (>= 0.4.0),
libwebp-dev,
diff --git a/debian/rules b/debian/rules
index 2d26b11..e48cb28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,12 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+# Because of bug #190367 hurd doesn't support samba
+DEB_TARGET_ARCH_OS:=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
+ifeq ($(DEB_TARGET_ARCH_OS), hurd)
+ DH_INSTALL_PARAMS := -Xkio_smb.so -Xsmb-network.desktop -Xsmb.protocol
+endif
+
.PHONY: override_dh_auto_test
override_dh_makeshlibs:
@@ -18,3 +24,6 @@ override_dh_fixperms:
override_dh_strip:
$(overridden_command) --dbg-package=kde-runtime-dbg
+
+override_dh_install:
+ dh_install $(DH_INSTALL_PARAMS)
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list