[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=f1f0012

The following commit has been merged in the master branch:
commit f1f0012ee974a70f23dce5cb65ca82d2179e39f3
Merge: 2b223203c3d6ff9d6b4317467c7dc75267f73621 bd18c8c0550187659aa8a2c0d22eb94d18ef1eb0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 13:48:27 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	data/ktelepathy.notifyrc

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc CMakeLists.txt
index 226a67f,5431db2..f2a5b89
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -5,10 -5,9 +5,10 @@@ set (CMAKE_MODULE_PAT
       ${CMAKE_MODULE_PATH}
  )
  
- set (KTP_VERSION "0.5.2")
+ set (KTP_VERSION "0.5.3")
  # Bump for every 0.x release, or whenever BC changes
 -set (KTP_SONUMBER 3)
 +set (KTP_SONUMBER 4)
 +set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "2")
  
  find_package (KDE4 REQUIRED)
  find_package (TelepathyQt4 0.9.2.1 REQUIRED)

-- 
ktp-common-internals packaging