[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=0dc1dd4

The following commit has been merged in the master branch:
commit 0dc1dd430e9c29199b6247e1f6660aa37cde39ba
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Thu May 29 16:57:49 2014 +0100

    add conflicts
---
 debian/changelog | 8 ++++++--
 debian/control   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c317d6d..f27caa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-kopete (4:4.13.0-0ubuntu4) UNRELEASED; urgency=medium
+kopete (4:4.13.0-0ubuntu5) utopic; urgency=medium
 
+  [ Harald Sitter ]
   * 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
+  [ Jonathan Riddell ]
+  * Add conflicts on obsolete kopete-cryptography
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 29 May 2014 16:57:19 +0100
 
 kopete (4:4.13.0-0ubuntu3) utopic; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2b8da1c..82efd87 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Recommends: libqca2-plugin-ossl, libqt4-sql-sqlite, kopete-message-indicator
 Suggests: kdeartwork-emoticons, khelpcenter4, texlive-latex-base, imagemagick
+Conflicts: kopete-cryptography
 Description: instant messaging and chat application
  Kopete is an instant messaging and chat application with support for a wide
  variety of services, such as AIM, Yahoo, ICQ, MSN, and Jabber.  Advanced

-- 
kopete packaging