[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:42 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=25fadde
The following commit has been merged in the master branch:
commit 25fadde3e5860d6689d33ac8499010dcfd0c615b
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Mon Nov 21 19:01:20 2011 +0100
Move paths to be consistent with the includes
---
CMakeLists.txt | 51 +---------------------
CMakeLists.txt => KTelepathy/CMakeLists.txt | 34 ++-------------
{models => KTelepathy/Models}/CMakeLists.txt | 0
.../Models}/accounts-filter-model.cpp | 0
.../Models}/accounts-filter-model.h | 2 +-
.../Models}/accounts-model-item.cpp | 0
.../Models}/accounts-model-item.h | 4 +-
{models => KTelepathy/Models}/accounts-model.cpp | 0
{models => KTelepathy/Models}/accounts-model.h | 2 +-
.../Models}/contact-model-item.cpp | 0
{models => KTelepathy/Models}/contact-model-item.h | 4 +-
.../Models}/groups-model-item.cpp | 0
{models => KTelepathy/Models}/groups-model-item.h | 4 +-
{models => KTelepathy/Models}/groups-model.cpp | 0
{models => KTelepathy/Models}/groups-model.h | 2 +-
{models => KTelepathy/Models}/proxy-tree-node.cpp | 0
{models => KTelepathy/Models}/proxy-tree-node.h | 4 +-
{models => KTelepathy/Models}/tree-node.cpp | 0
{models => KTelepathy/Models}/tree-node.h | 2 +-
.../circular-countdown.cpp | 0
.../circular-countdown.h | 2 +-
.../error-dictionary.cpp | 0
.../error-dictionary.h | 2 +-
.../global-presence.cpp | 0
global-presence.h => KTelepathy/global-presence.h | 2 +-
.../ktelepathy-export.h | 0
presence.cpp => KTelepathy/presence.cpp | 0
presence.h => KTelepathy/presence.h | 2 +-
.../service-availability-checker.cpp | 0
.../service-availability-checker.h | 2 +-
.../telepathy-handler-application.cpp | 0
.../telepathy-handler-application.h | 2 +-
text-parser.cpp => KTelepathy/text-parser.cpp | 0
text-parser.h => KTelepathy/text-parser.h | 2 +-
.../wallet-interface.cpp | 0
.../wallet-interface.h | 2 +-
36 files changed, 24 insertions(+), 101 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b9c15f..fa48c75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,53 +29,4 @@ include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
)
-set (telepathy_common_internals_private_SRCS
- circular-countdown.cpp
- error-dictionary.cpp
- global-presence.cpp
- presence.cpp
- service-availability-checker.cpp
- telepathy-handler-application.cpp
- text-parser.cpp
- wallet-interface.cpp
-)
-
-set (telepathy_common_internals_private_HDRS
- circular-countdown.h
- error-dictionary.h
- global-presence.h
- presence.h
- service-availability-checker.h
- telepathy-handler-application.h
- text-parser.h
- wallet-interface.h
-
- ktelepathy-export.h
-)
-
-kde4_add_library (telepathykdecommoninternalsprivate SHARED
- ${telepathy_common_internals_private_SRCS}
-)
-
-#Raise SOVERSION for every 0.x cycle
-set_target_properties(telepathykdecommoninternalsprivate PROPERTIES
- VERSION ${KTELEPATHY_VERSION}
- SOVERSION ${KTELEPATHY_SONUMBER}
- DEFINE_SYMBOL MAKE_KTELEPATHY_LIB)
-
-target_link_libraries (telepathykdecommoninternalsprivate
- ${KDE4_KDECORE_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
-)
-
-install (TARGETS telepathykdecommoninternalsprivate
- DESTINATION ${LIB_INSTALL_DIR}
-)
-
-install (FILES ${telepathy_common_internals_private_HDRS}
- DESTINATION ${TELEPATHY_QT4_INCLUDE_DIR}/KTelepathy
-)
-
-
-add_subdirectory(models)
+add_subdirectory(KTelepathy)
diff --git a/CMakeLists.txt b/KTelepathy/CMakeLists.txt
similarity index 65%
copy from CMakeLists.txt
copy to KTelepathy/CMakeLists.txt
index 2b9c15f..2a68ba6 100644
--- a/CMakeLists.txt
+++ b/KTelepathy/CMakeLists.txt
@@ -1,33 +1,5 @@
-project(telepathy-common-internals)
-
-set (CMAKE_MODULE_PATH
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
- ${CMAKE_MODULE_PATH}
-)
-
-set (KTELEPATHY_VERSION "0.3.0")
-# Bump for every 0.x release, or whenever BC changes
-set (KTELEPATHY_SONUMBER 0)
-
-find_package (KDE4 REQUIRED)
-find_package (TelepathyQt4 0.7.1 REQUIRED)
-
-# set some default settings
-include (KDE4Defaults)
-
-# make some more macros available
-include (MacroLibrary)
-
-add_definitions (${KDE4_DEFINITIONS}
- -DQT_NO_CAST_FROM_ASCII
- -DQT_NO_KEYWORDS
-)
-
-include_directories (${KDE4_INCLUDES}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${TELEPATHY_QT4_INCLUDE_DIR}
-)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR})
set (telepathy_common_internals_private_SRCS
circular-countdown.cpp
@@ -78,4 +50,4 @@ install (FILES ${telepathy_common_internals_private_HDRS}
)
-add_subdirectory(models)
+add_subdirectory(Models)
diff --git a/models/CMakeLists.txt b/KTelepathy/Models/CMakeLists.txt
similarity index 100%
rename from models/CMakeLists.txt
rename to KTelepathy/Models/CMakeLists.txt
diff --git a/models/accounts-filter-model.cpp b/KTelepathy/Models/accounts-filter-model.cpp
similarity index 100%
rename from models/accounts-filter-model.cpp
rename to KTelepathy/Models/accounts-filter-model.cpp
diff --git a/models/accounts-filter-model.h b/KTelepathy/Models/accounts-filter-model.h
similarity index 98%
rename from models/accounts-filter-model.h
rename to KTelepathy/Models/accounts-filter-model.h
index d100ef2..5a058e2 100644
--- a/models/accounts-filter-model.h
+++ b/KTelepathy/Models/accounts-filter-model.h
@@ -23,7 +23,7 @@
#include <QSortFilterProxyModel>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
class AccountsModelItem;
class ContactModelItem;
diff --git a/models/accounts-model-item.cpp b/KTelepathy/Models/accounts-model-item.cpp
similarity index 100%
rename from models/accounts-model-item.cpp
rename to KTelepathy/Models/accounts-model-item.cpp
diff --git a/models/accounts-model-item.h b/KTelepathy/Models/accounts-model-item.h
similarity index 96%
rename from models/accounts-model-item.h
rename to KTelepathy/Models/accounts-model-item.h
index 28f0463..e3dc0f3 100644
--- a/models/accounts-model-item.h
+++ b/KTelepathy/Models/accounts-model-item.h
@@ -29,9 +29,9 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
-#include "tree-node.h"
+#include <KTelepathy/Models/tree-node.h>
class KTELEPATHY_EXPORT AccountsModelItem : public TreeNode
{
diff --git a/models/accounts-model.cpp b/KTelepathy/Models/accounts-model.cpp
similarity index 100%
rename from models/accounts-model.cpp
rename to KTelepathy/Models/accounts-model.cpp
diff --git a/models/accounts-model.h b/KTelepathy/Models/accounts-model.h
similarity index 99%
rename from models/accounts-model.h
rename to KTelepathy/Models/accounts-model.h
index dbc9c22..12f2438 100644
--- a/models/accounts-model.h
+++ b/KTelepathy/Models/accounts-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
class ContactModelItem;
class TreeNode;
diff --git a/models/contact-model-item.cpp b/KTelepathy/Models/contact-model-item.cpp
similarity index 100%
rename from models/contact-model-item.cpp
rename to KTelepathy/Models/contact-model-item.cpp
diff --git a/models/contact-model-item.h b/KTelepathy/Models/contact-model-item.h
similarity index 95%
rename from models/contact-model-item.h
rename to KTelepathy/Models/contact-model-item.h
index 884324e..6526642 100644
--- a/models/contact-model-item.h
+++ b/KTelepathy/Models/contact-model-item.h
@@ -27,9 +27,9 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
-#include "tree-node.h"
+#include <KTelepathy/Models/tree-node.h>
class KTELEPATHY_EXPORT ContactModelItem : public TreeNode
{
diff --git a/models/groups-model-item.cpp b/KTelepathy/Models/groups-model-item.cpp
similarity index 100%
rename from models/groups-model-item.cpp
rename to KTelepathy/Models/groups-model-item.cpp
diff --git a/models/groups-model-item.h b/KTelepathy/Models/groups-model-item.h
similarity index 96%
rename from models/groups-model-item.h
rename to KTelepathy/Models/groups-model-item.h
index 60a2e75..1f2efab 100644
--- a/models/groups-model-item.h
+++ b/KTelepathy/Models/groups-model-item.h
@@ -29,9 +29,9 @@
#include <QtCore/QVariant> //needed for declare metatype
-#include "tree-node.h"
+#include <KTelepathy/Models/tree-node.h>
-#include "ktelepathy-export.h"
+#include <KTelepathy/ktelepathy-export.h>
class ContactModelItem;
class ProxyTreeNode;
diff --git a/models/groups-model.cpp b/KTelepathy/Models/groups-model.cpp
similarity index 100%
rename from models/groups-model.cpp
rename to KTelepathy/Models/groups-model.cpp
diff --git a/models/groups-model.h b/KTelepathy/Models/groups-model.h
similarity index 98%
rename from models/groups-model.h
rename to KTelepathy/Models/groups-model.h
index 620acbd..d3cd282 100644
--- a/models/groups-model.h
+++ b/KTelepathy/Models/groups-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Types>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
class ContactModelItem;
class GroupsModelItem;
diff --git a/models/proxy-tree-node.cpp b/KTelepathy/Models/proxy-tree-node.cpp
similarity index 100%
rename from models/proxy-tree-node.cpp
rename to KTelepathy/Models/proxy-tree-node.cpp
diff --git a/models/proxy-tree-node.h b/KTelepathy/Models/proxy-tree-node.h
similarity index 95%
rename from models/proxy-tree-node.h
rename to KTelepathy/Models/proxy-tree-node.h
index 528a473..d6cfb36 100644
--- a/models/proxy-tree-node.h
+++ b/KTelepathy/Models/proxy-tree-node.h
@@ -24,9 +24,9 @@
#include <QObject>
#include <QVariant>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
-#include "tree-node.h"
+#include <KTelepathy/Models/tree-node.h>
class ContactModelItem;
class KTELEPATHY_EXPORT ProxyTreeNode : public TreeNode
diff --git a/models/tree-node.cpp b/KTelepathy/Models/tree-node.cpp
similarity index 100%
rename from models/tree-node.cpp
rename to KTelepathy/Models/tree-node.cpp
diff --git a/models/tree-node.h b/KTelepathy/Models/tree-node.h
similarity index 97%
rename from models/tree-node.h
rename to KTelepathy/Models/tree-node.h
index 27faa01..68be7bb 100644
--- a/models/tree-node.h
+++ b/KTelepathy/Models/tree-node.h
@@ -26,7 +26,7 @@
#include <QObject>
#include <QVariant>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
class KTELEPATHY_EXPORT TreeNode : public QObject
{
diff --git a/circular-countdown.cpp b/KTelepathy/circular-countdown.cpp
similarity index 100%
rename from circular-countdown.cpp
rename to KTelepathy/circular-countdown.cpp
diff --git a/circular-countdown.h b/KTelepathy/circular-countdown.h
similarity index 97%
rename from circular-countdown.h
rename to KTelepathy/circular-countdown.h
index df54cd6..10f1658 100644
--- a/circular-countdown.h
+++ b/KTelepathy/circular-countdown.h
@@ -22,7 +22,7 @@
#include <QWidget>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/error-dictionary.cpp b/KTelepathy/error-dictionary.cpp
similarity index 100%
rename from error-dictionary.cpp
rename to KTelepathy/error-dictionary.cpp
diff --git a/error-dictionary.h b/KTelepathy/error-dictionary.h
similarity index 96%
rename from error-dictionary.h
rename to KTelepathy/error-dictionary.h
index c654170..414fd97 100644
--- a/error-dictionary.h
+++ b/KTelepathy/error-dictionary.h
@@ -23,7 +23,7 @@
#include <QString>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/global-presence.cpp b/KTelepathy/global-presence.cpp
similarity index 100%
rename from global-presence.cpp
rename to KTelepathy/global-presence.cpp
diff --git a/global-presence.h b/KTelepathy/global-presence.h
similarity index 98%
rename from global-presence.h
rename to KTelepathy/global-presence.h
index 6898d4c..19903d7 100644
--- a/global-presence.h
+++ b/KTelepathy/global-presence.h
@@ -25,7 +25,7 @@
#include <TelepathyQt4/AccountManager>
#include <TelepathyQt4/AccountSet>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/ktelepathy-export.h b/KTelepathy/ktelepathy-export.h
similarity index 100%
rename from ktelepathy-export.h
rename to KTelepathy/ktelepathy-export.h
diff --git a/presence.cpp b/KTelepathy/presence.cpp
similarity index 100%
rename from presence.cpp
rename to KTelepathy/presence.cpp
diff --git a/presence.h b/KTelepathy/presence.h
similarity index 97%
rename from presence.h
rename to KTelepathy/presence.h
index d0755ba..41baef7 100644
--- a/presence.h
+++ b/KTelepathy/presence.h
@@ -25,7 +25,7 @@
#include <KIcon>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/service-availability-checker.cpp b/KTelepathy/service-availability-checker.cpp
similarity index 100%
rename from service-availability-checker.cpp
rename to KTelepathy/service-availability-checker.cpp
diff --git a/service-availability-checker.h b/KTelepathy/service-availability-checker.h
similarity index 97%
rename from service-availability-checker.h
rename to KTelepathy/service-availability-checker.h
index b15ac01..fad1fc5 100644
--- a/service-availability-checker.h
+++ b/KTelepathy/service-availability-checker.h
@@ -20,7 +20,7 @@
#include <QtCore/QObject>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
class QDBusPendingCallWatcher;
diff --git a/telepathy-handler-application.cpp b/KTelepathy/telepathy-handler-application.cpp
similarity index 100%
rename from telepathy-handler-application.cpp
rename to KTelepathy/telepathy-handler-application.cpp
diff --git a/telepathy-handler-application.h b/KTelepathy/telepathy-handler-application.h
similarity index 98%
rename from telepathy-handler-application.h
rename to KTelepathy/telepathy-handler-application.h
index 204ee80..64ab876 100644
--- a/telepathy-handler-application.h
+++ b/KTelepathy/telepathy-handler-application.h
@@ -21,7 +21,7 @@
#include <KApplication>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/text-parser.cpp b/KTelepathy/text-parser.cpp
similarity index 100%
rename from text-parser.cpp
rename to KTelepathy/text-parser.cpp
diff --git a/text-parser.h b/KTelepathy/text-parser.h
similarity index 98%
rename from text-parser.h
rename to KTelepathy/text-parser.h
index 4ea9fcf..37eed91 100644
--- a/text-parser.h
+++ b/KTelepathy/text-parser.h
@@ -26,7 +26,7 @@
#include <QPair>
#include <QStringList>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
diff --git a/wallet-interface.cpp b/KTelepathy/wallet-interface.cpp
similarity index 100%
rename from wallet-interface.cpp
rename to KTelepathy/wallet-interface.cpp
diff --git a/wallet-interface.h b/KTelepathy/wallet-interface.h
similarity index 98%
rename from wallet-interface.h
rename to KTelepathy/wallet-interface.h
index 86dbdc1..941115a 100644
--- a/wallet-interface.h
+++ b/KTelepathy/wallet-interface.h
@@ -27,7 +27,7 @@
#include <QScopedPointer>
-#include <ktelepathy-export.h>
+#include <KTelepathy/ktelepathy-export.h>
namespace KTp
{
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list