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

The following commit has been merged in the master branch:
commit e28686bda6a4d52928d4172527855cac2e483fa8
Merge: 5f2dca5d27c9848bc78f48f4e18ef70dda767fa0 de45837914d06a15766b9f7afaa2778950e89976
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 12 12:53:48 2012 -0800

    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 2ac091a,c8e0322..1b26d54
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -5,9 -5,9 +5,9 @@@ set (CMAKE_MODULE_PAT
       ${CMAKE_MODULE_PATH}
  )
  
- set (KTP_VERSION "0.5.1")
+ set (KTP_VERSION "0.5.2")
  # Bump for every 0.x release, or whenever BC changes
 -set (KTP_SONUMBER 3)
 +set (KTP_SONUMBER 4)
  
  find_package (KDE4 REQUIRED)
  find_package (TelepathyQt4 0.9.2.1 REQUIRED)

-- 
ktp-common-internals packaging