[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=95cc516

The following commit has been merged in the master branch:
commit 95cc516bb1cafa37edb4ed41c24d2fa2957850ad
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat May 3 15:01:58 2014 -0400

    * Update debian/not-installed since both google-talk and skype are supported
    * Add skype icons back to kopete.install*
---
 debian/changelog              |  9 +++++++--
 debian/kopete.install         |  5 +++++
 debian/kopete.install.arm64   |  5 +++++
 debian/kopete.install.powerpc |  5 +++++
 debian/kopete.install.ppc64el |  5 +++++
 debian/not-installed          | 33 ---------------------------------
 6 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b077c07..ac9a671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-kopete (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
+kopete (4:4.13.0-0ubuntu2) utopic; urgency=medium
 
+  [ Rohan Garg ]
   * kopete should suggest imagemagick since the latex plugin
     requires it
 
- -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 29 Apr 2014 16:32:20 +0200
+  [ Scott Kitterman ]
+  * Update debian/not-installed since both google-talk and skype are supported
+  * Add skype icons back to kopete.install*
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 03 May 2014 15:00:12 -0400
 
 kopete (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
diff --git a/debian/kopete.install b/debian/kopete.install
index 3f65ddb..88ec30c 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -453,6 +453,11 @@ usr/share/kde4/apps/kopete/icons/oxygen/64x64/apps/wlm_protocol.png
 usr/share/kde4/apps/kopete/icons/oxygen/64x64/apps/wp_protocol.png
 usr/share/kde4/apps/kopete/icons/oxygen/64x64/apps/yahoo_protocol.png
 usr/share/kde4/apps/kopete/icons/oxygen/scalable/apps/meanwhile_protocol.svgz
+usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
 usr/share/kde4/apps/kopete_jabber/jabberchatui.rc
 usr/share/kde4/apps/kopete/kopetechatwindow.rc
 usr/share/kde4/apps/kopete/kopetecommandui.rc
diff --git a/debian/kopete.install.arm64 b/debian/kopete.install.arm64
index 18ab90f..549b2f5 100644
--- a/debian/kopete.install.arm64
+++ b/debian/kopete.install.arm64
@@ -196,6 +196,11 @@ usr/share/icons/oxygen/scalable/actions/webcamsend.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-finished.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-unverified.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-verified.svgz
+usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
 usr/share/kde4/apps/kconf_update/kopete-account-0.10.pl
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.sh
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.upd
diff --git a/debian/kopete.install.powerpc b/debian/kopete.install.powerpc
index 18ab90f..549b2f5 100644
--- a/debian/kopete.install.powerpc
+++ b/debian/kopete.install.powerpc
@@ -196,6 +196,11 @@ usr/share/icons/oxygen/scalable/actions/webcamsend.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-finished.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-unverified.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-verified.svgz
+usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
 usr/share/kde4/apps/kconf_update/kopete-account-0.10.pl
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.sh
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.upd
diff --git a/debian/kopete.install.ppc64el b/debian/kopete.install.ppc64el
index 18ab90f..549b2f5 100644
--- a/debian/kopete.install.ppc64el
+++ b/debian/kopete.install.ppc64el
@@ -196,6 +196,11 @@ usr/share/icons/oxygen/scalable/actions/webcamsend.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-finished.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-unverified.svgz
 usr/share/icons/oxygen/scalable/status/object-locked-verified.svgz
+usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
 usr/share/kde4/apps/kconf_update/kopete-account-0.10.pl
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.sh
 usr/share/kde4/apps/kconf_update/kopete-account-kconf_update.upd
diff --git a/debian/not-installed b/debian/not-installed
index f18fb56..b8fe7e3 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -12,36 +12,3 @@
 ./usr/lib/libkrdccore.so
 ./usr/lib/libkyahoo.so
 ./usr/lib/liboscar.so
-
-#gtalk and skype plugins not supported
-./usr/bin/googletalk-call
-./usr/lib/kde4/kopete_skype.so
-./usr/lib/mozilla/plugins/skypebuttons.so
-./usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_blockcontact.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_call.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.mng
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_away.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_dnd.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_invisible.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_not_available.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_offline.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_online.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeme.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_skypeout.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_unknown.png
-./usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
-./usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_blockcontact.png
-./usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_call.png
-./usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_contact_skypeout.png
-./usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
-./usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_blockcontact.png
-./usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_call.png
-./usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_contact_skypeout.png
-./usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
-./usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
-./usr/share/kde4/apps/kopete_skype/skypechatui.rc
-./usr/share/kde4/apps/kopete_skype/skypeui.rc
-./usr/share/kde4/services/kopete_skype.desktop
-./usr/share/kde4/services/skype.protocol

-- 
kopete packaging