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

The following commit has been merged in the master branch:
commit d3b76bf92499ab24da621e7ddf384452ed29ef6d
Author: Harald Sitter <apachelogger at ubuntu.com>
Date:   Tue May 13 11:03:38 2014 +0200

    * Restore lost changelog entries from before kdenetwork split
    * Drop kubuntu_03_no_mediastreamer_in_wlm.diff
      This patch was originally introduced to prevent !main software from
      getting dragged in when kopete still lived in main and was on the Kubuntu
      ISO. Since kopete is no longer in main this is a non-issue.
---
 debian/changelog                                       | 10 ++++++++++
 debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff | 15 ---------------
 debian/patches/series                                  |  1 -
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1771d8a..c317d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kopete (4:4.13.0-0ubuntu4) UNRELEASED; urgency=medium
+
+  * Restore lost changelog entries from before kdenetwork split
+  * Drop kubuntu_03_no_mediastreamer_in_wlm.diff
+    This patch was originally introduced to prevent !main software from
+    getting dragged in when kopete still lived in main and was on the Kubuntu
+    ISO. Since kopete is no longer in main this is a non-issue.
+
+ -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 13 May 2014 10:57:46 +0200
+
 kopete (4:4.13.0-0ubuntu3) utopic; urgency=medium
 
   * Build-depend on boost1.55.
diff --git a/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff b/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
deleted file mode 100644
index 0af9d72..0000000
--- a/debian/patches/kubuntu_03_no_mediastreamer_in_wlm.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kopete-4.11.80/protocols/CMakeLists.txt
-===================================================================
---- 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")
--  set(BUILD_WLM_MEDIASTREAMER TRUE)
-+  message(STATUS "Not building Windows Live Messenger voice clip support")
-+  set(BUILD_WLM_MEDIASTREAMER FALSE)
- else(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER)
-   message(STATUS "Not building Windows Live Messenger voice clip support")
-   set(BUILD_WLM_MEDIASTREAMER FALSE)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b2ed00c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_03_no_mediastreamer_in_wlm.diff

-- 
kopete packaging