[SCM] konqueror packaging branch, master, updated. 5f2c6d237e526aecb51ad069e012b69cadbb293b

[Jonathan Riddell]

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

The following commit has been merged in the master branch:
commit d14fd40ee86d29af25efc6f512030a8615ea305e
Merge: e2f5208300dd07392f3760706b14ec20a8daaa8e 1d9f08d9c76cea4e28f345e36a23c16d91a361bc
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 15 19:30:13 2016 +0000

    merge debian/stable

 debian/control                               |  12 ++-
 debian/man/{konqueror.1 => keditbookmarks.1} | 138 +++++++++------------------
 2 files changed, 56 insertions(+), 94 deletions(-)

diff --cc debian/control
index fb40865,bad192a..b4f2be0
--- a/debian/control
+++ b/debian/control
@@@ -48,6 -58,8 +48,10 @@@ Description: advanced file manager, we
   It is the canvas for many KDE technologies, from remote file access via KIO to
   component embedding via the KParts object interface, making it one of the most
   customizable applications available.
+  .
+  This package is part of the KDE base applications module.
++Breaks: ase-data (<< 4:4.7.2), kde-baseapps-data (<< 4:4.8.4)
++Replaces: kde-baseapps-data (<< 4:4.8.4), kdebase-data (<< 4:4.7.2)
  
  Package: konq-plugins
  Architecture: any

-- 
konqueror packaging