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

The following commit has been merged in the master branch:
commit c551572bde5a04bbbeae9e6e74a76a959ca7c537
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Fri Jul 26 16:43:29 2013 +0100

    * Remove DISABLE_VIDEOSUPPORT=true, no longer a compile failure
    * Add build-dep on libv4l-dev, libexpat1-dev
    * Add back Skype protocol now trademarked icons removed upstream
---
 debian/changelog      |  3 +++
 debian/control        |  4 ++--
 debian/kopete.install | 39 +++++++++++++++++++++++++++++++++++++++
 debian/rules          |  2 +-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f12850..e7ba740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 kopete (4:4.10.97-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream RC 2 release
+  * Remove DISABLE_VIDEOSUPPORT=true, no longer a compile failure
+  * Add build-dep on libv4l-dev, libexpat1-dev
+  * Add back Skype protocol now trademarked icons removed upstream
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 25 Jul 2013 13:01:13 +0100
 
diff --git a/debian/control b/debian/control
index 81ba729..0eabff3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
  libssl-dev, libxss-dev, 
  libmediastreamer-dev, libmeanwhile-dev, libgadu-dev,
  libjasper-dev, libgif-dev, libotr2-dev, libjsoncpp-dev,
- libboost1.53-dev
-Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64], libv4l-dev [linux-any]
+ libboost1.53-dev, libv4l-dev, libexpat1-dev
+Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64]
 Standards-Version: 3.9.4
 Homepage: http://www.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kopete
diff --git a/debian/kopete.install b/debian/kopete.install
index 66a1a28..b92799a 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -719,3 +719,42 @@ usr/share/kde4/apps/kopete_history2/history2ui.rc
 usr/share/kde4/config.kcfg/history2config.kcfg
 usr/share/kde4/services/kconfiguredialog/kopete_history2_config.desktop
 usr/share/kde4/services/kopete_history2.desktop
+usr/lib/libkopete_videodevice.so.4.11.0
+usr/lib/libkopete_videodevice.so.4
+usr/lib/kde4/kcm_kopete_avdeviceconfig.so
+usr/share/kde4/services/kopete_avdeviceconfig.desktop
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/kopete_avdevice.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/kopete_avdevice.png
+usr/share/kde4/apps/kopete/icons/oxygen/64x64/apps/kopete_avdevice.png
+usr/lib/mozilla/plugins/skypebuttons.so
+usr/lib/kde4/kopete_skype.so
+usr/bin/googletalk-call
+usr/share/kde4/services/kopete_skype.desktop
+usr/share/kde4/services/skype.protocol
+usr/share/kde4/apps/kopete_skype/skypechatui.rc
+usr/share/kde4/apps/kopete_skype/skypeui.rc
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_contact_skypeout.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_call.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/actions/skype_blockcontact.png
+usr/share/kde4/apps/kopete/icons/oxygen/32x32/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/kopete_avdevice.png
+usr/share/kde4/apps/kopete/icons/oxygen/128x128/apps/skype_protocol.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_skypeout.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.mng
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_contact_invisible.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_call.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_connecting.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_unknown.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_skypeme.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_dnd.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/actions/skype_blockcontact.png
+usr/share/kde4/apps/kopete/icons/oxygen/16x16/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_contact_skypeout.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_call.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/actions/skype_blockcontact.png
+usr/share/kde4/apps/kopete/icons/oxygen/22x22/apps/skype_protocol.png
+usr/share/kde4/apps/kopete/icons/oxygen/48x48/apps/skype_protocol.png
diff --git a/debian/rules b/debian/rules
index 1896eef..c8f0921 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 .PHONY: override_dh_auto_test
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DDISABLE_VIDEOSUPPORT=true
+	$(overridden_command)
 
 override_dh_shlibdeps:
 	$(overridden_command) -plibkopete4 -- -xkopete

-- 
kopete packaging