[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:19:02 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2845012

The following commit has been merged in the master branch:
commit 28450120eb19247d9e7d2eb429e07c5b5a131396
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Feb 26 01:45:53 2011 +0000

    Remove include ../lib hack and use new global includes for the non-lib
    parts of the handler.
---
 CMakeLists.txt                                     |  2 +-
 adiumxtra-protocol-handler/CMakeLists.txt          |  4 +--
 .../adiumxtra-protocol-handler.cpp                 |  2 +-
 .../chat-style-installer.cpp                       |  4 +--
 .../emoticon-set-installer.cpp                     |  4 +--
 app/CMakeLists.txt                                 |  4 +--
 config/CMakeLists.txt                              |  4 +--
 config/main-window.cpp                             |  8 +++---
 lib/CMakeLists.txt                                 | 32 ++++++++++++++++++++++
 lib/{ => KDETelepathy}/AdiumThemeContentInfo       |  2 +-
 lib/{ => KDETelepathy}/AdiumThemeHeaderInfo        |  2 +-
 lib/{ => KDETelepathy}/AdiumThemeMessageInfo       |  2 +-
 lib/{ => KDETelepathy}/AdiumThemeStatusInfo        |  2 +-
 lib/{ => KDETelepathy}/AdiumThemeView              |  2 +-
 lib/{ => KDETelepathy}/ChatStylePlistFileReader    |  2 +-
 lib/{ => KDETelepathy}/ChatWidget                  |  2 +-
 lib/{ => KDETelepathy}/ChatWindowStyle             |  2 +-
 lib/{ => KDETelepathy}/ChatWindowStyleManager      |  2 +-
 18 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d352370..e988991 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (telepathy_chat_handler)
+project (TELEPATHY_CHAT_HANDLER)
 
 # Include our extra FindFoo.cmake files.
 set (CMAKE_MODULE_PATH
diff --git a/adiumxtra-protocol-handler/CMakeLists.txt b/adiumxtra-protocol-handler/CMakeLists.txt
index 7ee4be4..45f9e7b 100644
--- a/adiumxtra-protocol-handler/CMakeLists.txt
+++ b/adiumxtra-protocol-handler/CMakeLists.txt
@@ -1,6 +1,4 @@
-# FIXME when the chat connection builds a lib correctly, don't do this weird horrible hack.
-
-include_directories(../lib/)
+include_directories(${TELEPATHY_CHAT_HANDLER_SOURCE_DIR}/lib)
 
 set(telepathy_chat_config_SRCS
         bundle-installer.cpp
diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
index a2666e3..29c7efa 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
@@ -21,7 +21,7 @@
 #include "chat-style-installer.h"
 #include "emoticon-set-installer.h"
 
-#include "chat-window-style-manager.h"
+#include <KDETelepathy/ChatWindowStyleManager>
 
 #include <KDebug>
 #include <KZip>
diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index 8873436..4a8ef01 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -18,8 +18,8 @@
 
 #include "chat-style-installer.h"
 
-#include "chat-window-style-manager.h"
-#include "chat-style-plist-file-reader.h"
+#include <KDETelepathy/ChatWindowStyleManager>
+#include <KDETelepathy/ChatStylePlistFileReader>
 
 #include <KDebug>
 #include <KTemporaryFile>
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.cpp b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
index e3e4d35..47d593e 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.cpp
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
@@ -18,8 +18,8 @@
 
 #include "emoticon-set-installer.h"
 
-#include "chat-window-style-manager.h"
-#include "chat-style-plist-file-reader.h"
+#include <KDETelepathy/ChatWindowStyleManager>
+#include <KDETelepathy/ChatStylePlistFileReader>
 
 #include <KDebug>
 #include <KTemporaryFile>
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 07eea1e..825c840 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,6 +1,4 @@
-# FIXME when the chat connection builds a lib correctly, don't do this weird horrible hack.
-
-include_directories(../lib/)
+include_directories(${TELEPATHY_CHAT_HANDLER_SOURCE_DIR}/lib)
 
 set(telepathy_chat_handler_SRCS
         main.cpp
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 1ae0c67..2b94469 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,6 +1,4 @@
-# FIXME when the chat connection builds a lib correctly, don't do this weird horrible hack.
-
-include_directories(../lib/)
+include_directories(${TELEPATHY_CHAT_HANDLER_SOURCE_DIR}/lib)
 
 set(telepathy_chat_config_SRCS
         main.cpp
diff --git a/config/main-window.cpp b/config/main-window.cpp
index 7f5e90b..7e28346 100644
--- a/config/main-window.cpp
+++ b/config/main-window.cpp
@@ -19,11 +19,11 @@
 
 #include "main-window.h"
 #include "ui_chatwindowconfig.h"
-#include "chat-window-style-manager.h"
 
-#include "adium-theme-header-info.h"
-#include "adium-theme-content-info.h"
-#include "adium-theme-status-info.h"
+#include <KDETelepathy/ChatWindowStyleManager>
+#include <KDETelepathy/AdiumThemeHeaderInfo>
+#include <KDETelepathy/AdiumThemeContentInfo>
+#include <KDETelepathy/AdiumThemeStatusInfo>
 
 #include <KDebug>
 #include <KLocalizedString>
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index fcf9f63..a39912c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,6 +12,30 @@ set(telepathy_chat_handler_lib_SRCS
         chat-text-edit.cpp
 )
 
+set(telepathy_chat_handler_lib_HDRS
+    adiumthemecontentinfo.h
+    adiumthemeheaderinfo.h
+    adiumthememessageinfo.h
+    adiumthemestatusinfo.h
+    adiumthemeview.h
+    chatstyleplistfilereader.h
+    chatwidget.h
+    chatwindowstyle.h
+    chatwindowstylemanager.h
+)
+
+set(telepathy_chat_handler_lib_PRETTY_HDRS
+    KDETelepathy/AdiumThemeContentInfo
+    KDETelepathy/AdiumThemeHeaderInfo
+    KDETelepathy/AdiumThemeMessageInfo
+    KDETelepathy/AdiumThemeStatusInfo
+    KDETelepathy/AdiumThemeView
+    KDETelepathy/ChatStylePlistFileReader
+    KDETelepathy/ChatWidget
+    KDETelepathy/ChatWindowStyle
+    KDETelepathy/ChatWindowStyleManager
+)
+
 set(telepathy_chat_handler_lib_UI
     chat-widget.ui)
 
@@ -30,4 +54,12 @@ target_link_libraries(ktelepathy_chat_lib
 )
 install(TARGETS ktelepathy_chat_lib ${INSTALL_TARGETS_DEFAULT_ARGS})
 
+install(FILES
+        ${telepathy_chat_handler_lib_HDRS}
+        ${telepathy_chat_handler_lib_PRETTY_HDRS}
+        kdetelepathychat_export.h
+        DESTINATION ${INCLUDE_INSTALL_DIR}/KDETelepathy COMPONENT Devel
+)
+
+
 install( FILES ktelepathy.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktelepathy)
diff --git a/lib/AdiumThemeContentInfo b/lib/KDETelepathy/AdiumThemeContentInfo
similarity index 75%
copy from lib/AdiumThemeContentInfo
copy to lib/KDETelepathy/AdiumThemeContentInfo
index 79a64fb..68aa635 100644
--- a/lib/AdiumThemeContentInfo
+++ b/lib/KDETelepathy/AdiumThemeContentInfo
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_CONTENT_INFO
 #define KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_CONTENT_INFO
 
-#include <adiumthemecontentinfo.h>
+#include "adium-theme-content-info.h"
 
 #endif
diff --git a/lib/AdiumThemeHeaderInfo b/lib/KDETelepathy/AdiumThemeHeaderInfo
similarity index 75%
copy from lib/AdiumThemeHeaderInfo
copy to lib/KDETelepathy/AdiumThemeHeaderInfo
index f9eb8c1..e8c8f6a 100644
--- a/lib/AdiumThemeHeaderInfo
+++ b/lib/KDETelepathy/AdiumThemeHeaderInfo
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_HEADER_INFO
 #define KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_HEADER_INFO
 
-#include <adiumthemeheaderinfo.h>
+#include "adium-theme-header-info.h"
 
 #endif
diff --git a/lib/AdiumThemeMessageInfo b/lib/KDETelepathy/AdiumThemeMessageInfo
similarity index 75%
copy from lib/AdiumThemeMessageInfo
copy to lib/KDETelepathy/AdiumThemeMessageInfo
index 4dd9546..922f4dc 100644
--- a/lib/AdiumThemeMessageInfo
+++ b/lib/KDETelepathy/AdiumThemeMessageInfo
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_MESSAGE_INFO
 #define KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_MESSAGE_INFO
 
-#include <adiumthememessageinfo.h>
+#include "adium-theme-message-info.h"
 
 #endif
diff --git a/lib/AdiumThemeStatusInfo b/lib/KDETelepathy/AdiumThemeStatusInfo
similarity index 75%
copy from lib/AdiumThemeStatusInfo
copy to lib/KDETelepathy/AdiumThemeStatusInfo
index fbb4ac5..b0b9db4 100644
--- a/lib/AdiumThemeStatusInfo
+++ b/lib/KDETelepathy/AdiumThemeStatusInfo
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_STATUSINFO
 #define KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_STATUSINFO
 
-#include <adiumthemestatusinfo.h>
+#include "adium-theme-status-info.h"
 
 #endif
diff --git a/lib/AdiumThemeView b/lib/KDETelepathy/AdiumThemeView
similarity index 77%
copy from lib/AdiumThemeView
copy to lib/KDETelepathy/AdiumThemeView
index 9bc7570..a30f4cf 100644
--- a/lib/AdiumThemeView
+++ b/lib/KDETelepathy/AdiumThemeView
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_VIEW
 #define KDE_TELEPATHY_TEXT_UI_ADIUM_THEME_VIEW
 
-#include <adiumthemeview.h>
+#include "adium-theme-view.h"
 
 #endif
diff --git a/lib/ChatStylePlistFileReader b/lib/KDETelepathy/ChatStylePlistFileReader
similarity index 75%
copy from lib/ChatStylePlistFileReader
copy to lib/KDETelepathy/ChatStylePlistFileReader
index 801e52a..ed858b1 100644
--- a/lib/ChatStylePlistFileReader
+++ b/lib/KDETelepathy/ChatStylePlistFileReader
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_CHAT_STYLE_PLIST_FILE_READER
 #define KDE_TELEPATHY_TEXT_UI_CHAT_STYLE_PLIST_FILE_READER
 
-#include <chatstyleplistfilereader.h>
+#include "chat-style-plist-file-reader.h"
 
 #endif
diff --git a/lib/ChatWidget b/lib/KDETelepathy/ChatWidget
similarity index 78%
copy from lib/ChatWidget
copy to lib/KDETelepathy/ChatWidget
index 38b5f1c..902ca64 100644
--- a/lib/ChatWidget
+++ b/lib/KDETelepathy/ChatWidget
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_CHAT_WIDGET
 #define KDE_TELEPATHY_TEXT_UI_CHAT_WIDGET
 
-#include <chatwidget.h>
+#include "chat-widget.h"
 
 #endif
diff --git a/lib/ChatWindowStyle b/lib/KDETelepathy/ChatWindowStyle
similarity index 77%
copy from lib/ChatWindowStyle
copy to lib/KDETelepathy/ChatWindowStyle
index a16dd93..b434b07 100644
--- a/lib/ChatWindowStyle
+++ b/lib/KDETelepathy/ChatWindowStyle
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_CHAT_WINDOW_STYLE
 #define KDE_TELEPATHY_TEXT_UI_CHAT_WINDOW_STYLE
 
-#include <chatwindowstyle.h>
+#include "chat-window-style.h"
 
 #endif
diff --git a/lib/ChatWindowStyleManager b/lib/KDETelepathy/ChatWindowStyleManager
similarity index 75%
copy from lib/ChatWindowStyleManager
copy to lib/KDETelepathy/ChatWindowStyleManager
index 2ba7cb7..fbfb6e3 100644
--- a/lib/ChatWindowStyleManager
+++ b/lib/KDETelepathy/ChatWindowStyleManager
@@ -1,6 +1,6 @@
 #ifndef KDE_TELEPATHY_TEXT_UI_CHAT_WINDOW_STYLE_MANAGER
 #define KDE_TELEPATHY_TEXT_UI_CHAT_WINDOW_STYLE_MANAGER
 
-#include <chatwindowstylemanager.h>
+#include "chat-window-style-manager.h"
 
 #endif

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list