[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=5d68137

The following commit has been merged in the master branch:
commit 5d681376d396d9cbe9cf340d026de3178b059402
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Mon Jun 30 16:25:43 2014 +0200

    * Add back conflicts on kopete-cryptography
    * Add back suggests on imagemagick needed by latex plugin
---
 debian/.gitattributes       | 1 -
 debian/changelog            | 7 ++++---
 debian/control              | 3 ++-
 debian/source/local-options | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index f60697b..21ad4d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-kopete (4:4.13.2-0ubuntu1) utopic; urgency=medium
+kopete (4:4.13.2-0ubuntu2) utopic; urgency=medium
 
-  * new upstream release
+  * Add back conflicts on kopete-cryptography
+  * Add back suggests on imagemagick needed by latex plugin
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 12:03:38 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Jun 2014 16:22:40 +0200
 
 kopete (4:4.13.2-0ubuntu1) utopic; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1658f07..d30b75d 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,8 @@ Section: net
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Recommends: libqca2-plugin-ossl, libqt4-sql-sqlite, kopete-message-indicator
-Suggests: kdeartwork-emoticons, khelpcenter4, texlive-latex-base
+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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
kopete packaging