[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 15:03:09 UTC 2014


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

The following commit has been merged in the master branch:
commit af625f954ae74ac392353af14204f03da567891c
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Aug 9 21:21:42 2013 -0400

    * Disable building googletalk on powerpc because the embedded libjingle does
      not support ppc
      - Override config option in debian/rules
      - Add powerpc specific kopete.install file
    * Removed obsolete debian/source/lintian-overrides
---
 debian/changelog                | 8 ++++++++
 debian/rules                    | 6 ++++++
 debian/source/lintian-overrides | 1 -
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a1cd600..b9d041b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
 kopete (4:4.11.0-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Howard Chan ]
   * New upstream release
   * Add libsrtp0-dev and libasound2-dev as build-dep of kopete
   * Introduce patch at http://bugsfiles.kde.org/attachment.cgi?id=80534
     to fix audio_stream
 
+  [ Scott Kitterman ]
+  * Disable building googletalk on powerpc because the embedded libjingle does
+    not support ppc
+    - Override config option in debian/rules
+    - Add powerpc specific kopete.install file
+  * Removed obsolete debian/source/lintian-overrides
+
  -- Howard Chan <smartboyhw at gmail.com>  Thu, 08 Aug 2013 12:25:57 +0800
 
 kopete (4:4.10.97-0ubuntu1) saucy; urgency=low
diff --git a/debian/rules b/debian/rules
index c8f0921..f5ecefb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,16 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 .PHONY: override_dh_auto_test
 
 override_dh_auto_configure:
+ifeq ($(DEB_HOST_GNU_TYPE),powerpc)
+	$(overridden_command) -- -DWITH_GOOGLETALK=false
+else
 	$(overridden_command)
+endif
 
 override_dh_shlibdeps:
 	$(overridden_command) -plibkopete4 -- -xkopete
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 3347ebb..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kdenetwork source: dbg-package-missing-depends kdenetwork-dbg

-- 
kopete packaging



More information about the pkg-kde-commits mailing list