[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.7.4-2-1-gae6623e

[Ana Beatriz Guerrero López]

The following commit has been merged in the master branch:
commit ae6623ef1de3e97c8dac2025b3be1e70acd5db73
Author: Ana Beatriz Guerrero López <ana at ekaia.org>
Date:   Mon Mar 5 14:35:19 2012 +0100

    remove libkactivities stuff
---
 debian/changelog            |    8 ++++++++
 debian/kdelibs5-dev.install |    3 ---
 debian/rules                |    3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 970d706..118bc9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kde4libs (4:4.7.4-3) unstable; urgency=low
+
+  * Team upload.
+  * Do not export libkactivities library targets in the cmake configuration
+    of kdelibs. Also do not install libkactivities's headers.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 05 Mar 2012 14:32:02 +0100
+
 kde4libs (4:4.7.4-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/kdelibs5-dev.install b/debian/kdelibs5-dev.install
index f148d81..ee76757 100644
--- a/debian/kdelibs5-dev.install
+++ b/debian/kdelibs5-dev.install
@@ -1085,9 +1085,6 @@ usr/include/kactioncollection.h
 usr/include/kactionmenu.h
 usr/include/kactionselector.h
 usr/include/kactivelabel.h
-usr/include/kactivityconsumer.h
-usr/include/kactivitycontroller.h
-usr/include/kactivityinfo.h
 usr/include/kallocator.h
 usr/include/kanimatedbutton.h
 usr/include/kapplication.h
diff --git a/debian/rules b/debian/rules
index f70bc0f..89f8530 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ override_dh_auto_configure:
 	    -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
 	    -DLIB_INSTALL_DIR=/usr/lib \
 	    -DSYSCONF_INSTALL_DIR=/etc \
-	    -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit
+	    -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit \
+		-DBUILD_libkactivities=OFF
 
 .PHONY: override_dh_auto_test
 

-- 
KDE Development Platform Libraries module packaging