[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=4ff62a5

The following commit has been merged in the master branch:
commit 4ff62a568a85b3753732cca2a11acd8c55fd4f61
Merge: b70ff198fab6ee2e6e1f8e70bb2971e9b79b3242 7886d4374d4aa16240a6beb1adeebbdec3d62b11
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Nov 1 00:46:28 2012 +0100

    Merge branch 'kde-telepathy-0.5'

 CMakeLists.txt                                                       | 5 +++++
 adiumxtra-protocol-handler/main.cpp                                  | 3 ++-
 app/main.cpp                                                         | 3 ++-
 filters/emoticons/ktptextui_message_filter_emoticons.desktop         | 1 +
 filters/formatting/ktptextui_message_filter_formatting.desktop       | 1 +
 filters/images/ktptextui_message_filter_images.desktop               | 1 +
 .../searchexpansion/ktptextui_message_filter_searchexpansion.desktop | 1 +
 lib/ktptxtui_message_filter.desktop                                  | 4 ++++
 lib/plugin-config-manager.cpp                                        | 4 +++-
 logviewer/main.cpp                                                   | 3 ++-
 version.h.in                                                         | 2 ++
 11 files changed, 24 insertions(+), 4 deletions(-)

diff --cc CMakeLists.txt
index 1d1d72b,ab7c85c..0f6ede4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -35,9 -38,11 +37,12 @@@ if(TELEPATHY_LOGGER_QT4_FOUND
      include_directories(
          ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
      )
 +    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
  endif()
  
+ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
  add_subdirectory(lib)
  add_subdirectory(app)
  add_subdirectory(config)
diff --cc lib/ktptxtui_message_filter.desktop
index c7d0453,ff8b967..9984625
--- a/lib/ktptxtui_message_filter.desktop
+++ b/lib/ktptxtui_message_filter.desktop
@@@ -27,5 -23,8 +27,9 @@@ Comment[sr at latin]=Filter poruka za Tele
  Comment[sv]=Telepathy meddelandefilter för textbaserat användargränssnitt
  Comment[uk]=Фільтр повідомлень текстового інтерфейсу Telepathy
  Comment[x-test]=xxTelepathy Text-Ui Message Filterxx
 +Comment[zh_CN]=Telepathy 文本界面消息过滤器
  Comment[zh_TW]=Telepathy 文字介面訊息過濾器
+ 
+ # The ktp-text-ui plugin framework version for which the plugin is written
+ [PropertyDef::X-KTp-PluginInfo-Version]
+ Type=int

-- 
ktp-text-ui packaging