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

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

    [kaccounts] For reasons unknown, the sipe account needs to be sipe-haze
    
    ...rather than haze-sipe.
---
 .../{ktp-haze-sipe-im.service.in => ktp-sipe-haze-im.service.in}    | 6 +++---
 .../{ktp-haze-sipe.provider.in => ktp-sipe-haze.provider.in}        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/kaccounts/ktp-haze-sipe-im.service.in b/data/kaccounts/ktp-sipe-haze-im.service.in
similarity index 85%
rename from data/kaccounts/ktp-haze-sipe-im.service.in
rename to data/kaccounts/ktp-sipe-haze-im.service.in
index ef9544b..3653f74 100644
--- a/data/kaccounts/ktp-haze-sipe-im.service.in
+++ b/data/kaccounts/ktp-sipe-haze-im.service.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<service id="ktp-haze-sipe-im">
+<service id="ktp-sipe-haze-im">
   <type>IM</type>
   <!-- SIPE Chat - Service name being displayed as a checkbox label to enable/disable this service -->
   <_name>Chat</_name>
-  <icon>im-sipe</icon>
-  <provider>ktp-haze-sipe</provider>
+  <icon>telepathy-kde</icon>
+  <provider>ktp-sipe-haze</provider>
   <translations>kaccounts-providers</translations>
 
   <template>
diff --git a/data/kaccounts/ktp-haze-sipe.provider.in b/data/kaccounts/ktp-sipe-haze.provider.in
similarity index 73%
rename from data/kaccounts/ktp-haze-sipe.provider.in
rename to data/kaccounts/ktp-sipe-haze.provider.in
index 9a043f4..e4d0e8e 100644
--- a/data/kaccounts/ktp-haze-sipe.provider.in
+++ b/data/kaccounts/ktp-sipe-haze.provider.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<provider id="ktp-haze-sipe">
-    <_name>Office 365 (Lync)</_name>
-    <icon>im-sipe</icon>
+<provider id="ktp-sipe-haze">
+    <_name>Office 365/Lync (via libpurple)</_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>
     <translations>kaccounts-providers</translations>

-- 
ktp-accounts-kcm packaging