[SCM] kopete packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.1-1ubuntu2-4-g62191d0

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 62191d039f7b9f9184637eec9a0b61a821067766
Merge: 6fbb33df15dfabb6e5c762cd98fc60956a06f4f6 6481ea0c5337200a8138549b53ae322302477fe9
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Mar 21 22:46:11 2016 +0100

    Merge branch 'disable_test' into kubuntu_xenial_archive

 debian/changelog                         |  7 +++++++
 debian/patches/disable_failing_test.diff | 28 ++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 36 insertions(+)

diff --cc debian/changelog
index 7716c9f,7e4bb10..fff02ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,19 @@@
 +kopete (4:15.12.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream bugfix release. 
 +  * Combine duplicate licence entries into single licence types
 +    to make lintian happy. 
 +  * Another new upstream bugfix release. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 10 Mar 2016 08:59:50 -0800
 +
+ kopete (4:15.12.1-1ubuntu2) xenial; urgency=medium
+ 
+   * Add disable_failing_test.diff to disable a test that fails upstream and
+     blocks the autopkgtest QA
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 21 Mar 2016 22:43:10 +0100
+ 
  kopete (4:15.12.1-1ubuntu1) xenial; urgency=medium
  
    * Debian merge: No remaining changes. 

-- 
kopete packaging