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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 31 15:03:11 UTC 2014 

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

The following commit has been merged in the master branch:
commit 78b01e951c91f6e3e30fc036c30e856e172c0b25
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Thu Nov 14 17:07:59 2013 +0100

    * Bump build dependency to libotr5-dev
    * Update symbols
    * Update install files
    * Drop new_linphone.diff, not required anymore
---
 debian/changelog                                   |  4 +++
 debian/control                                     |  2 +-
 debian/kopete.install                              | 26 +------------------
 debian/libkopete4.symbols                          |  5 +++-
 .../kubuntu_03_no_mediastreamer_in_wlm.diff        | 10 ++++----
 debian/patches/new_linphone.diff                   | 29 ----------------------
 debian/patches/series                              |  1 -
 7 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 575438a..2e909a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 kopete (4:4.11.80-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream beta release
+  * Bump build dependency to libotr5-dev
+  * Update symbols
+  * Update install files
+  * Drop new_linphone.diff, not required anymore
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 13 Nov 2013 19:53:00 +0100
 
diff --git a/debian/control b/debian/control
index edad21a..d5a4e3a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
  libvncserver-dev (>= 0.9.8.1), 
  libssl-dev, libxss-dev, 
  libmediastreamer-dev, libmeanwhile-dev, libgadu-dev,
- libjasper-dev, libgif-dev, libotr2-dev, libjsoncpp-dev,
+ libjasper-dev, libgif-dev, libotr5-dev, libjsoncpp-dev,
  libboost1.54-dev, libv4l-dev, libexpat1-dev, libsrtp0-dev,
  libasound2-dev
 Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64]
diff --git a/debian/kopete.install b/debian/kopete.install
index 577053a..76782a7 100644
--- a/debian/kopete.install
+++ b/debian/kopete.install
@@ -142,6 +142,7 @@ usr/share/icons/oxygen/16x16/actions/account_offline_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_away_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_busy_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_food_overlay.png
+usr/share/icons/oxygen/16x16/actions/contact_freeforchat_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_invisible_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_phone_overlay.png
 usr/share/icons/oxygen/16x16/actions/contact_xa_overlay.png
@@ -732,28 +733,3 @@ 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/libkopete4.symbols b/debian/libkopete4.symbols
index de8780c..8ee13b6 100644
--- a/debian/libkopete4.symbols
+++ b/debian/libkopete4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.10.80 i386
+# SymbolsHelper-Confirmed: 4:4.11.80 i386
 libkopete.so.4 libkopete4 #MINVER#
  _ZGVZN6Kopete2UI8ListView4Item7Private18theVisibilityTimerEvE5timer at Base 4:4.3.4
  _ZGVZN6Kopete2UI8ListView4Item7Private21theLayoutAnimateTimerEvE5timer at Base 4:4.3.4
@@ -1377,6 +1377,7 @@ libkopete.so.4 libkopete4 #MINVER#
  _ZN6Kopete7Contact8sendFileERK4KUrlRK7QStringj at Base 4:4.3.4
  _ZN6Kopete7Contact8setPhotoERK7QString at Base 4:4.3.4
  _ZN6Kopete7Contact9popupMenuEPNS_11ChatSessionE at Base 4:4.3.4
+ _ZN6Kopete7Contact9popupMenuEv at Base 4:4.11.80
  _ZN6Kopete7Contact9serializeER4QMapI7QStringS2_ES4_ at Base 4:4.3.4
  _ZN6Kopete7Contact9slotBlockEv at Base 4:4.3.4
  _ZN6Kopete7Contact9startChatEv at Base 4:4.3.4
@@ -1399,12 +1400,14 @@ libkopete.so.4 libkopete4 #MINVER#
  _ZN6Kopete7Message13setImportanceENS0_17MessageImportanceE at Base 4:4.3.4
  _ZN6Kopete7Message14regexpPatternsEv at Base 4:4.4.1
  _ZN6Kopete7Message14setFilePreviewERK7QPixmap at Base 4:4.3.4
+ _ZN6Kopete7Message17setForcedHtmlBodyERK7QString at Base 4:4.11.80
  _ZN6Kopete7Message18setBackgroundColorERK6QColor at Base 4:4.3.4
  _ZN6Kopete7Message18setForegroundColorERK6QColor at Base 4:4.3.4
  _ZN6Kopete7Message18setRequestedPluginERK7QString at Base 4:4.3.4
  _ZN6Kopete7Message19setRichTextOverrideEb at Base 4:4.3.4
  _ZN6Kopete7Message21setBackgroundOverrideEb at Base 4:4.3.4
  _ZN6Kopete7Message21setForegroundOverrideEb at Base 4:4.3.4
+ _ZN6Kopete7Message21setFormattingOverrideEb at Base 4:4.11.80
  _ZN6Kopete7Message23setFileTransferDisabledEb at Base 4:4.3.4
  _ZN6Kopete7Message6escapeERK7QString at Base 4:4.3.4
  _ZN6Kopete7Message6nextIdEv at Base 4:4.3.4
diff --git a/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff b/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
index 2668abe..0af9d72 100644
--- a/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
+++ b/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
@@ -1,9 +1,9 @@
-Index: kopete-4.10.80/protocols/CMakeLists.txt
+Index: kopete-4.11.80/protocols/CMakeLists.txt
 ===================================================================
---- kopete-4.10.80.orig/protocols/CMakeLists.txt	2013-06-18 16:54:11.838060735 +0100
-+++ kopete-4.10.80/protocols/CMakeLists.txt	2013-06-18 16:54:11.834060735 +0100
-@@ -43,8 +43,8 @@
- endif(SSL_FOUND OR WIN32)
+--- kopete-4.11.80.orig/protocols/CMakeLists.txt	2013-11-14 16:09:23.449330409 +0100
++++ kopete-4.11.80/protocols/CMakeLists.txt	2013-11-14 16:09:23.441330409 +0100
+@@ -39,8 +39,8 @@
+ endif(OPENSSL_FOUND OR WIN32)
  
  if(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER)
 -  message(STATUS "Building Windows Live Messenger voice clip support")
diff --git a/debian/patches/new_linphone.diff b/debian/patches/new_linphone.diff
deleted file mode 100644
index f4c0105..0000000
--- a/debian/patches/new_linphone.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fix build with the libraries of linphone >= 3.6.
- - in linphonemediaengine.cc, cast audio_stream_ to the "base" MediaStream
-   struct
- - stun.h: make the header guard a bit more specific, so it is different than
-   the one of the stun.h provided by libortp
-Forwarded: no
-Last-Update: 2013-09-08
-
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@
-       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
-       pt_ = i->id;
-       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
--      port2 = rtp_session_get_local_port(audio_stream_->session);
-+      port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
-       first = false;
-     }
-   }
-@@ -211,7 +211,7 @@
-     // working with a buggy client; let's try PCMU.
-     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
-     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
--    port2 = rtp_session_get_local_port(audio_stream_->session);
-+    port2 = rtp_session_get_local_port(((MediaStream *)audio_stream_)->session);
-   }
- 
-   return true;
diff --git a/debian/patches/series b/debian/patches/series
index a86d042..b2ed00c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 kubuntu_03_no_mediastreamer_in_wlm.diff
-new_linphone.diff

-- 
kopete packaging

More information about the pkg-kde-commits mailing list