[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:10 UTC 2014


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

The following commit has been merged in the master branch:
commit 13804fda79fe144f499c40bf85a4902a80f400a7
Author: Philip Muskovac <yofel at gmx.net>
Date:   Sat Aug 17 15:46:10 2013 +0200

    Query DEB_HOST_GNU_CPU instead of DEB_HOST_GNU_TYPE for the powerpc
    detection
---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e867dd2..e601605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kopete (4:4.11.0-0ubuntu2) saucy; urgency=low
+
+  * Query DEB_HOST_GNU_CPU instead of DEB_HOST_GNU_TYPE for the powerpc
+    detection
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 17 Aug 2013 15:45:18 +0200
+
 kopete (4:4.11.0-0ubuntu1) saucy; urgency=low
 
   [ Howard Chan ]
diff --git a/debian/rules b/debian/rules
index f5ecefb..b1682ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,12 @@
 
 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)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 
 .PHONY: override_dh_auto_test
 
 override_dh_auto_configure:
-ifeq ($(DEB_HOST_GNU_TYPE),powerpc)
+ifeq ($(DEB_HOST_GNU_CPU),powerpc)
 	$(overridden_command) -- -DWITH_GOOGLETALK=false
 else
 	$(overridden_command)

-- 
kopete packaging



More information about the pkg-kde-commits mailing list