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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0f8b3d2be600981e4a54d1ec02d3a47aa390238c
Merge: c20a4db9c70868da67975665be2b20f1c43220f5 11bdf020a259d264f80f9bbad583bf8939e67fe9
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Thu Dec 22 18:04:17 2011 +0200

    Merge branch 'ktp-rename'
    
    Reviewed-by: Dario Freddi <dario.freddi at collabora.com>
    REVIEW: 103490

 CMakeLists.txt                                     |  2 +-
 adiumxtra-protocol-handler/CMakeLists.txt          | 16 +++-----
 adiumxtra-protocol-handler/Messages.sh             |  2 +-
 .../adiumxtra-protocol-handler.cpp                 |  2 +-
 adiumxtra-protocol-handler/adiumxtra.protocol.in   |  2 +-
 .../chat-style-installer.cpp                       |  4 +-
 .../emoticon-set-installer.cpp                     |  4 +-
 adiumxtra-protocol-handler/main.cpp                |  2 +-
 app/CMakeLists.txt                                 | 22 +++++------
 app/{KDE.TextUi.client => KTp.TextUi.client}       |  0
 app/Messages.sh                                    |  2 +-
 app/chat-tab.cpp                                   |  2 +-
 app/chat-window.cpp                                |  6 +--
 app/chatwindow.rc                                  |  2 +-
 app/main.cpp                                       |  4 +-
 ...edesktop.Telepathy.Client.KDE.TextUi.service.in |  3 --
 ...edesktop.Telepathy.Client.KTp.TextUi.service.in |  3 ++
 config/CMakeLists.txt                              | 34 ++++++++---------
 config/Messages.sh                                 |  8 +++-
 config/appearance-config.cpp                       | 12 +++---
 config/behavior-config.cpp                         |  2 +-
 ...fig.desktop => kcm_ktp_chat_appearance.desktop} |  2 +-
 ...onfig.desktop => kcm_ktp_chat_behavior.desktop} |  2 +-
 lib/CMakeLists.txt                                 | 44 +++++++++++-----------
 lib/{KDETelepathy => KTp}/AdiumThemeContentInfo    |  0
 lib/{KDETelepathy => KTp}/AdiumThemeHeaderInfo     |  0
 lib/{KDETelepathy => KTp}/AdiumThemeMessageInfo    |  0
 lib/{KDETelepathy => KTp}/AdiumThemeStatusInfo     |  0
 lib/{KDETelepathy => KTp}/AdiumThemeView           |  0
 lib/{KDETelepathy => KTp}/ChatStylePlistFileReader |  0
 lib/{KDETelepathy => KTp}/ChatWidget               |  0
 lib/{KDETelepathy => KTp}/ChatWindowStyle          |  0
 lib/{KDETelepathy => KTp}/ChatWindowStyleManager   |  0
 lib/Messages.sh                                    |  2 +-
 lib/adium-theme-content-info.h                     |  2 +-
 lib/adium-theme-header-info.h                      |  2 +-
 lib/adium-theme-message-info.h                     |  2 +-
 lib/adium-theme-status-info.h                      |  2 +-
 lib/adium-theme-view.h                             |  2 +-
 lib/chat-search-bar.h                              |  2 +-
 lib/chat-style-plist-file-reader.h                 |  2 +-
 lib/chat-widget.cpp                                |  2 +-
 lib/chat-widget.h                                  |  2 +-
 lib/chat-window-style-manager.h                    |  2 +-
 lib/chat-window-style.h                            |  2 +-
 ...{kdetelepathychat_export.h => ktpchat_export.h} |  0
 46 files changed, 103 insertions(+), 103 deletions(-)

-- 
ktp-text-ui packaging