[SCM] qapt packaging branch, master, updated. debian/3.0.0-5-4-g58307b2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=58307b2

The following commit has been merged in the master branch:
commit 58307b22887288fddd76efac44d1558100dcab4c
Merge: 55bd5b4d241c3eaeeb336cdd4ce7f9e8006279a8 10d2b43053a63d35c51250fc23c075e385f04513
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Sep 2 11:11:43 2015 +0200

    Merge branch 'qapt_kde4'

 .gitignore       | 3 ---
 debian/changelog | 7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index b072fe3,f035e67..7181c63
--- a/debian/changelog
+++ b/debian/changelog
@@@ -310,26 -25,6 +310,33 @@@ qapt (1.3.0-2) unstable; urgency=lo
  
   -- Pino Toscano <pino at debian.org>  Fri, 11 May 2012 15:43:13 +0200
  
 +qapt (1.3.1-0ubuntu2) precise; urgency=low
 +
 +  * Cherry-pick several patches from the 1.3 branch: (LP: #976159)
 +    - Add fix_misreported_marking_errors.diff to stop marking errors being
 +      reported as lock errors.
 +    - Add fix_worker_upgrade_marking.diff, which uses a more conservative
 +      problem resolution method to fix marking issues that occur while
 +      marking single packages for upgrade, as well as fixes an issue where
 +      the worker would not clear errors caused by marking issues that had
 +      been fixed manually.
 +
 + -- Jonathan Thomas <echidnaman at kubuntu.org>  Sat, 07 Apr 2012 19:48:44 -0400
 +
 +qapt (1.3.1-0ubuntu1) precise; urgency=low
 +
 +  * New upstream bugfix release
 +  * Bump debhelper compat to 9
 +
 + -- Jonathan Thomas <echidnaman at kubuntu.org>  Sun, 01 Apr 2012 12:24:05 -0400
 +
++qapt (1.3.0-2.1) unstable; urgency=medium
++
++  * Non-maintainer upload.
++  * Update the symbols file (Xilin Sun). Closes: #746894, #746263.
++
++ -- Matthias Klose <doko at debian.org>  Sat, 09 Aug 2014 12:39:10 +0200
++
  qapt (1.3.0-1) unstable; urgency=low
  
    [ Kai Wasserbäch ]

-- 
qapt packaging