[SCM] kopete packaging branch, master, updated. debian/4.11.3-1-4-gc3f878a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=c3f878a

The following commit has been merged in the master branch:
commit c3f878aef83627571efc93d2825f167ffc10e847
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 1 10:57:52 2013 +0100

    temporarily disable the googletalk integration on non-Linux OSes
    
    it does not build on them and it needs quite some changes to do that
---
 debian/changelog |  2 ++
 debian/rules     | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5c855a0..26d659f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kopete (4:4.11.3-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Import part of libjingle's r305 to allow building on unknown architectures;
     patch libjingle_unknown_architecture.diff.
+  * Temporarily disable the googletalk integration on non-Linux OSes, as it
+    does not build on them and it needs quite some changes to do that.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Nov 2013 22:13:16 +0100
 
diff --git a/debian/rules b/debian/rules
index 9190487..5b18eb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,23 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+  CONFIGURE_ARGS += -DWITH_GOOGLETALK=false
+endif
+
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDE4_BUILD_TESTS=false
+	$(overridden_command) -- -DKDE4_BUILD_TESTS=false $(CONFIGURE_ARGS)
+
+override_dh_install:
+	grep -v googletalk-call debian/kopete.install > debian/kopete.install.kfreebsd
+	$(overridden_command)
+
+override_dh_clean:
+	$(overridden_command)
+	rm -f debian/kopete.install.kfreebsd
 
 .PHONY: override_dh_auto_test
 

-- 
kopete packaging