[SCM] kopete packaging branch, master, updated. debian/16.08.1-3-10-gdecb60c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c5470297a2dd6848b5d21a46eb3294f9f341d16f
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 1 11:28:15 2018 +0100

    update the patches
    
    - fix_otr.patch: drop, backported from upstream
---
 debian/changelog             |  2 ++
 debian/patches/fix_otr.patch | 23 -----------------------
 debian/patches/series        |  1 -
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ef4ef5..9a9e96f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kopete (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Standards-Version to 4.1.3, no changes required.
   * Simplify watch file, and switch it to https.
+  * Update the patches:
+    - fix_otr.patch: drop, backported from upstream
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 18:02:13 +0100
 
diff --git a/debian/patches/fix_otr.patch b/debian/patches/fix_otr.patch
deleted file mode 100644
index 12e537e..0000000
--- a/debian/patches/fix_otr.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix invisible OTR status changes
-   * Add debian/patches/fix_otr.patch from upstream to resolve issue with
-     unencrypted messages being sent without notice (Closes: #827048)
-Author: Scott Kitterman <scott at kitterman.com>
-Bug-Debian: http://bugs.debian.org/827048
-Origin: upstream
-Bug: https://bugs.kde.org/show_bug.cgi?id=362535
-Forwarded: not-needed
-Last-Update: 2017-01-13
-
---- kopete-16.08.1.orig/plugins/otr/otrlchatinterface.cpp
-+++ kopete-16.08.1/plugins/otr/otrlchatinterface.cpp
-@@ -744,6 +744,10 @@ int OtrlChatInterface::privState( Kopete
- 	ConnContext *context = otrl_context_find(userstate, session->members().first()->contactId().toLocal8Bit(), session->account()->accountId().toLocal8Bit(), session->account()->protocol()->displayName().toLocal8Bit(), instance, 0, NULL, NULL, NULL);
- 
- 	if( context ){
-+		if( instance == OTRL_INSTAG_BEST && context->their_instance ){
-+			kDebug(14318) << "Updating otr-instag to" << context->their_instance << "for session" << session;
-+			session->setProperty("otr-instag", QString::number(context->their_instance));
-+		}
- 		switch( context->msgstate ){
- 		case OTRL_MSGSTATE_PLAINTEXT:
- 			return 0;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e96aa61..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_otr.patch

-- 
kopete packaging