[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

Maximiliano Curia maxy at moszumanska.debian.org
Mon May 9 09:04:44 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b3a1372

The following commit has been merged in the master branch:
commit b3a1372640351c82bf8c4bf59abe4eae800e85b2
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Wed Dec 21 18:18:56 2011 +0100

    rename-fury: Change paths
---
 CMakeLists.txt                                        | 2 +-
 {KTelepathy => KTp}/CMakeLists.txt                    | 2 +-
 {KTelepathy => KTp}/Models/CMakeLists.txt             | 2 +-
 {KTelepathy => KTp}/Models/accounts-filter-model.cpp  | 0
 {KTelepathy => KTp}/Models/accounts-filter-model.h    | 2 +-
 {KTelepathy => KTp}/Models/accounts-model-item.cpp    | 0
 {KTelepathy => KTp}/Models/accounts-model-item.h      | 4 ++--
 {KTelepathy => KTp}/Models/accounts-model.cpp         | 0
 {KTelepathy => KTp}/Models/accounts-model.h           | 2 +-
 {KTelepathy => KTp}/Models/contact-model-item.cpp     | 0
 {KTelepathy => KTp}/Models/contact-model-item.h       | 4 ++--
 {KTelepathy => KTp}/Models/groups-model-item.cpp      | 0
 {KTelepathy => KTp}/Models/groups-model-item.h        | 4 ++--
 {KTelepathy => KTp}/Models/groups-model.cpp           | 0
 {KTelepathy => KTp}/Models/groups-model.h             | 2 +-
 {KTelepathy => KTp}/Models/proxy-tree-node.cpp        | 0
 {KTelepathy => KTp}/Models/proxy-tree-node.h          | 4 ++--
 {KTelepathy => KTp}/Models/tree-node.cpp              | 0
 {KTelepathy => KTp}/Models/tree-node.h                | 2 +-
 {KTelepathy => KTp}/circular-countdown.cpp            | 0
 {KTelepathy => KTp}/circular-countdown.h              | 2 +-
 {KTelepathy => KTp}/error-dictionary.cpp              | 0
 {KTelepathy => KTp}/error-dictionary.h                | 2 +-
 {KTelepathy => KTp}/global-presence.cpp               | 0
 {KTelepathy => KTp}/global-presence.h                 | 2 +-
 {KTelepathy => KTp}/ktelepathy-export.h               | 0
 {KTelepathy => KTp}/presence.cpp                      | 0
 {KTelepathy => KTp}/presence.h                        | 2 +-
 {KTelepathy => KTp}/service-availability-checker.cpp  | 0
 {KTelepathy => KTp}/service-availability-checker.h    | 2 +-
 {KTelepathy => KTp}/telepathy-handler-application.cpp | 0
 {KTelepathy => KTp}/telepathy-handler-application.h   | 2 +-
 {KTelepathy => KTp}/text-parser.cpp                   | 0
 {KTelepathy => KTp}/text-parser.h                     | 2 +-
 {KTelepathy => KTp}/wallet-interface.cpp              | 0
 {KTelepathy => KTp}/wallet-interface.h                | 2 +-
 36 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2476ba7..f3250b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,4 +29,4 @@ include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
 )
 
-add_subdirectory(KTelepathy)
+add_subdirectory(KTp)
diff --git a/KTelepathy/CMakeLists.txt b/KTp/CMakeLists.txt
similarity index 96%
rename from KTelepathy/CMakeLists.txt
rename to KTp/CMakeLists.txt
index 4954ca2..0938730 100644
--- a/KTelepathy/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -46,7 +46,7 @@ install (TARGETS ktpcommoninternalsprivate
 )
 
 install (FILES ${telepathy_common_internals_private_HDRS}
-         DESTINATION ${INCLUDE_INSTALL_DIR}/KTelepathy
+         DESTINATION ${INCLUDE_INSTALL_DIR}/KTp
 )
 
 
diff --git a/KTelepathy/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
similarity index 95%
rename from KTelepathy/Models/CMakeLists.txt
rename to KTp/Models/CMakeLists.txt
index 546c67c..c68ddcf 100644
--- a/KTelepathy/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -47,6 +47,6 @@ install (TARGETS ktpmodelsprivate
 )
 
 install (FILES ${telepathy_models_private_HDRS}
-         DESTINATION ${INCLUDE_INSTALL_DIR}/KTelepathy/Models
+         DESTINATION ${INCLUDE_INSTALL_DIR}/KTp/Models
 )
 
diff --git a/KTelepathy/Models/accounts-filter-model.cpp b/KTp/Models/accounts-filter-model.cpp
similarity index 100%
rename from KTelepathy/Models/accounts-filter-model.cpp
rename to KTp/Models/accounts-filter-model.cpp
diff --git a/KTelepathy/Models/accounts-filter-model.h b/KTp/Models/accounts-filter-model.h
similarity index 98%
rename from KTelepathy/Models/accounts-filter-model.h
rename to KTp/Models/accounts-filter-model.h
index 9c799b1..fb4a283 100644
--- a/KTelepathy/Models/accounts-filter-model.h
+++ b/KTp/Models/accounts-filter-model.h
@@ -23,7 +23,7 @@
 
 #include <QSortFilterProxyModel>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class AccountsModelItem;
 class ContactModelItem;
diff --git a/KTelepathy/Models/accounts-model-item.cpp b/KTp/Models/accounts-model-item.cpp
similarity index 100%
rename from KTelepathy/Models/accounts-model-item.cpp
rename to KTp/Models/accounts-model-item.cpp
diff --git a/KTelepathy/Models/accounts-model-item.h b/KTp/Models/accounts-model-item.h
similarity index 96%
rename from KTelepathy/Models/accounts-model-item.h
rename to KTp/Models/accounts-model-item.h
index 14692d7..64f676c 100644
--- a/KTelepathy/Models/accounts-model-item.h
+++ b/KTp/Models/accounts-model-item.h
@@ -29,9 +29,9 @@
 
 #include <QtCore/QVariant> //needed for declare metatype
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
-#include <KTelepathy/Models/tree-node.h>
+#include <KTp/Models/tree-node.h>
 
 class KTELEPATHY_EXPORT AccountsModelItem : public TreeNode
 {
diff --git a/KTelepathy/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
similarity index 100%
rename from KTelepathy/Models/accounts-model.cpp
rename to KTp/Models/accounts-model.cpp
diff --git a/KTelepathy/Models/accounts-model.h b/KTp/Models/accounts-model.h
similarity index 99%
rename from KTelepathy/Models/accounts-model.h
rename to KTp/Models/accounts-model.h
index 09c6c7f..2628ba1 100644
--- a/KTelepathy/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -30,7 +30,7 @@
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/Types>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class ContactModelItem;
 class TreeNode;
diff --git a/KTelepathy/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
similarity index 100%
rename from KTelepathy/Models/contact-model-item.cpp
rename to KTp/Models/contact-model-item.cpp
diff --git a/KTelepathy/Models/contact-model-item.h b/KTp/Models/contact-model-item.h
similarity index 95%
rename from KTelepathy/Models/contact-model-item.h
rename to KTp/Models/contact-model-item.h
index b22d059..b04912b 100644
--- a/KTelepathy/Models/contact-model-item.h
+++ b/KTp/Models/contact-model-item.h
@@ -27,9 +27,9 @@
 
 #include <QtCore/QVariant> //needed for declare metatype
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
-#include <KTelepathy/Models/tree-node.h>
+#include <KTp/Models/tree-node.h>
 
 class KTELEPATHY_EXPORT ContactModelItem : public TreeNode
 {
diff --git a/KTelepathy/Models/groups-model-item.cpp b/KTp/Models/groups-model-item.cpp
similarity index 100%
rename from KTelepathy/Models/groups-model-item.cpp
rename to KTp/Models/groups-model-item.cpp
diff --git a/KTelepathy/Models/groups-model-item.h b/KTp/Models/groups-model-item.h
similarity index 96%
rename from KTelepathy/Models/groups-model-item.h
rename to KTp/Models/groups-model-item.h
index c994f3d..4dd8f7e 100644
--- a/KTelepathy/Models/groups-model-item.h
+++ b/KTp/Models/groups-model-item.h
@@ -29,9 +29,9 @@
 
 #include <QtCore/QVariant> //needed for declare metatype
 
-#include <KTelepathy/Models/tree-node.h>
+#include <KTp/Models/tree-node.h>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class ContactModelItem;
 class ProxyTreeNode;
diff --git a/KTelepathy/Models/groups-model.cpp b/KTp/Models/groups-model.cpp
similarity index 100%
rename from KTelepathy/Models/groups-model.cpp
rename to KTp/Models/groups-model.cpp
diff --git a/KTelepathy/Models/groups-model.h b/KTp/Models/groups-model.h
similarity index 98%
rename from KTelepathy/Models/groups-model.h
rename to KTp/Models/groups-model.h
index e38cbf0..6955fd0 100644
--- a/KTelepathy/Models/groups-model.h
+++ b/KTp/Models/groups-model.h
@@ -30,7 +30,7 @@
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/Types>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class ContactModelItem;
 class GroupsModelItem;
diff --git a/KTelepathy/Models/proxy-tree-node.cpp b/KTp/Models/proxy-tree-node.cpp
similarity index 100%
rename from KTelepathy/Models/proxy-tree-node.cpp
rename to KTp/Models/proxy-tree-node.cpp
diff --git a/KTelepathy/Models/proxy-tree-node.h b/KTp/Models/proxy-tree-node.h
similarity index 95%
rename from KTelepathy/Models/proxy-tree-node.h
rename to KTp/Models/proxy-tree-node.h
index d6cfb36..f4e1901 100644
--- a/KTelepathy/Models/proxy-tree-node.h
+++ b/KTp/Models/proxy-tree-node.h
@@ -24,9 +24,9 @@
 #include <QObject>
 #include <QVariant>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
-#include <KTelepathy/Models/tree-node.h>
+#include <KTp/Models/tree-node.h>
 
 class ContactModelItem;
 class KTELEPATHY_EXPORT ProxyTreeNode : public TreeNode
diff --git a/KTelepathy/Models/tree-node.cpp b/KTp/Models/tree-node.cpp
similarity index 100%
rename from KTelepathy/Models/tree-node.cpp
rename to KTp/Models/tree-node.cpp
diff --git a/KTelepathy/Models/tree-node.h b/KTp/Models/tree-node.h
similarity index 97%
rename from KTelepathy/Models/tree-node.h
rename to KTp/Models/tree-node.h
index 7155b01..fb51f7b 100644
--- a/KTelepathy/Models/tree-node.h
+++ b/KTp/Models/tree-node.h
@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QVariant>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class KTELEPATHY_EXPORT TreeNode : public QObject
 {
diff --git a/KTelepathy/circular-countdown.cpp b/KTp/circular-countdown.cpp
similarity index 100%
rename from KTelepathy/circular-countdown.cpp
rename to KTp/circular-countdown.cpp
diff --git a/KTelepathy/circular-countdown.h b/KTp/circular-countdown.h
similarity index 97%
rename from KTelepathy/circular-countdown.h
rename to KTp/circular-countdown.h
index 10f1658..94d9394 100644
--- a/KTelepathy/circular-countdown.h
+++ b/KTp/circular-countdown.h
@@ -22,7 +22,7 @@
 
 #include <QWidget>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {
diff --git a/KTelepathy/error-dictionary.cpp b/KTp/error-dictionary.cpp
similarity index 100%
rename from KTelepathy/error-dictionary.cpp
rename to KTp/error-dictionary.cpp
diff --git a/KTelepathy/error-dictionary.h b/KTp/error-dictionary.h
similarity index 96%
rename from KTelepathy/error-dictionary.h
rename to KTp/error-dictionary.h
index 414fd97..8611f6a 100644
--- a/KTelepathy/error-dictionary.h
+++ b/KTp/error-dictionary.h
@@ -23,7 +23,7 @@
 
 #include <QString>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {
diff --git a/KTelepathy/global-presence.cpp b/KTp/global-presence.cpp
similarity index 100%
rename from KTelepathy/global-presence.cpp
rename to KTp/global-presence.cpp
diff --git a/KTelepathy/global-presence.h b/KTp/global-presence.h
similarity index 98%
rename from KTelepathy/global-presence.h
rename to KTp/global-presence.h
index 194f8cc..2e4de5c 100644
--- a/KTelepathy/global-presence.h
+++ b/KTp/global-presence.h
@@ -25,7 +25,7 @@
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/AccountSet>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 #include "presence.h"
 
 namespace KTp
diff --git a/KTelepathy/ktelepathy-export.h b/KTp/ktelepathy-export.h
similarity index 100%
rename from KTelepathy/ktelepathy-export.h
rename to KTp/ktelepathy-export.h
diff --git a/KTelepathy/presence.cpp b/KTp/presence.cpp
similarity index 100%
rename from KTelepathy/presence.cpp
rename to KTp/presence.cpp
diff --git a/KTelepathy/presence.h b/KTp/presence.h
similarity index 97%
rename from KTelepathy/presence.h
rename to KTp/presence.h
index 71e7c6e..331f418 100644
--- a/KTelepathy/presence.h
+++ b/KTp/presence.h
@@ -25,7 +25,7 @@
 
 #include <KIcon>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {
diff --git a/KTelepathy/service-availability-checker.cpp b/KTp/service-availability-checker.cpp
similarity index 100%
rename from KTelepathy/service-availability-checker.cpp
rename to KTp/service-availability-checker.cpp
diff --git a/KTelepathy/service-availability-checker.h b/KTp/service-availability-checker.h
similarity index 97%
rename from KTelepathy/service-availability-checker.h
rename to KTp/service-availability-checker.h
index c2d7b83..c62daed 100644
--- a/KTelepathy/service-availability-checker.h
+++ b/KTp/service-availability-checker.h
@@ -20,7 +20,7 @@
 
 #include <QtCore/QObject>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 class QDBusPendingCallWatcher;
 
diff --git a/KTelepathy/telepathy-handler-application.cpp b/KTp/telepathy-handler-application.cpp
similarity index 100%
rename from KTelepathy/telepathy-handler-application.cpp
rename to KTp/telepathy-handler-application.cpp
diff --git a/KTelepathy/telepathy-handler-application.h b/KTp/telepathy-handler-application.h
similarity index 98%
rename from KTelepathy/telepathy-handler-application.h
rename to KTp/telepathy-handler-application.h
index 64ab876..dec49a9 100644
--- a/KTelepathy/telepathy-handler-application.h
+++ b/KTp/telepathy-handler-application.h
@@ -21,7 +21,7 @@
 
 #include <KApplication>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {
diff --git a/KTelepathy/text-parser.cpp b/KTp/text-parser.cpp
similarity index 100%
rename from KTelepathy/text-parser.cpp
rename to KTp/text-parser.cpp
diff --git a/KTelepathy/text-parser.h b/KTp/text-parser.h
similarity index 98%
rename from KTelepathy/text-parser.h
rename to KTp/text-parser.h
index aae4672..04082ed 100644
--- a/KTelepathy/text-parser.h
+++ b/KTp/text-parser.h
@@ -26,7 +26,7 @@
 #include <QPair>
 #include <QStringList>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {
diff --git a/KTelepathy/wallet-interface.cpp b/KTp/wallet-interface.cpp
similarity index 100%
rename from KTelepathy/wallet-interface.cpp
rename to KTp/wallet-interface.cpp
diff --git a/KTelepathy/wallet-interface.h b/KTp/wallet-interface.h
similarity index 98%
rename from KTelepathy/wallet-interface.h
rename to KTp/wallet-interface.h
index 9c4eb27..ea36193 100644
--- a/KTelepathy/wallet-interface.h
+++ b/KTp/wallet-interface.h
@@ -27,7 +27,7 @@
 
 #include <QScopedPointer>
 
-#include <KTelepathy/ktelepathy-export.h>
+#include <KTp/ktelepathy-export.h>
 
 namespace KTp
 {

-- 
ktp-common-internals packaging

More information about the pkg-kde-commits mailing list