[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=d9117e3

The following commit has been merged in the master branch:
commit d9117e30d00c18409e5c48d03d2ec6d61cdf7866
Merge: a8319f5a55097d4166507f2888d857f4028bf05d 30fd590133b64d1c868513da8c8ea9326f326f16
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Dec 15 17:34:15 2012 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	CMakeLists.txt

 CMakeLists.txt                                     | 2 +-
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc CMakeLists.txt
index 1a75afc,e1e4258..3057b3c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,7 -1,7 +1,7 @@@
  project(ktp-text-ui)
  
- set(KTP_TEXT_UI_VERSION "0.5.1")
+ set(KTP_TEXT_UI_VERSION "0.5.2")
 -set(KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION "1")
 +set(KTP_TEXT_UI_PLUGIN_FRAMEWORK_VERSION "2")
  set(IS_KTP_INTERNAL_MODULE TRUE)
  
  # Include our extra FindFoo.cmake files.

-- 
ktp-text-ui packaging