[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=33c4b31

The following commit has been merged in the master branch:
commit 33c4b317743975342d40541f30ea26b54efb46c8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Dec 22 18:42:28 2011 +0000

    Use includes from KTp not KTelepathy
---
 presence/src/presence-applet.cpp | 2 +-
 presence/src/presence-applet.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index bc5442d..3ca0c10 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -29,7 +29,7 @@
 #include <KToolInvocation>
 #include <KUser>
 
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
 
 #include <Plasma/ToolTipManager>
 
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index 7042538..9e62514 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -26,7 +26,7 @@
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/Presence>
 
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
 
 namespace KTp {
     class GlobalPresence;

-- 
ktp-contact-applet packaging