[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=b240293

The following commit has been merged in the master branch:
commit b240293a307a40b94f550cf2b4189bbfcc636d76
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jul 20 16:39:03 2015 +0200

    [kaccounts] Add SIPE/SIPE kaccounts provider
    
    This one is meant for combo of SIPE CM and SIPE protocol (whereas the
    other one is haze/SIPE)
---
 .../{ktp-sipe-haze-im.service.in => ktp-sipe-im.service.in}         | 6 +++---
 data/kaccounts/{ktp-sipe-haze.provider.in => ktp-sipe.provider.in}  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/kaccounts/ktp-sipe-haze-im.service.in b/data/kaccounts/ktp-sipe-im.service.in
similarity index 82%
copy from data/kaccounts/ktp-sipe-haze-im.service.in
copy to data/kaccounts/ktp-sipe-im.service.in
index 3653f74..fdd28b9 100644
--- a/data/kaccounts/ktp-sipe-haze-im.service.in
+++ b/data/kaccounts/ktp-sipe-im.service.in
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<service id="ktp-sipe-haze-im">
+<service id="ktp-sipe-im">
   <type>IM</type>
   <!-- SIPE Chat - Service name being displayed as a checkbox label to enable/disable this service -->
   <_name>Chat</_name>
   <icon>telepathy-kde</icon>
-  <provider>ktp-sipe-haze</provider>
+  <provider>ktp-sipe</provider>
   <translations>kaccounts-providers</translations>
 
   <template>
       <group name="telepathy">
-          <setting name="manager">haze</setting>
+          <setting name="manager">sipe</setting>
           <setting name="protocol">sipe</setting>
       </group>
       <group name="auth">
diff --git a/data/kaccounts/ktp-sipe-haze.provider.in b/data/kaccounts/ktp-sipe.provider.in
similarity index 81%
copy from data/kaccounts/ktp-sipe-haze.provider.in
copy to data/kaccounts/ktp-sipe.provider.in
index e4d0e8e..7b00c8a 100644
--- a/data/kaccounts/ktp-sipe-haze.provider.in
+++ b/data/kaccounts/ktp-sipe.provider.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<provider id="ktp-sipe-haze">
-    <_name>Office 365/Lync (via libpurple)</_name>
+<provider id="ktp-sipe">
+    <_name>Office 365/Lync</_name>
     <icon>telepathy-kde</icon>
     <!-- Tooltip text appearing over the button to create this type of account -->
     <_description>Chat account in the Office 365/Lync network</_description>

-- 
ktp-accounts-kcm packaging