[SCM] konqueror packaging branch, master, updated. 3b293809ad0ad2d4642e8d830644255c283c969d

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 667a85e0ab990aa3cb2878dae82e6b3dc771d1dd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 27 10:59:34 2017 +0200

    Add breaks/replaces for kde-l10n-ast and kde-l10n-eo
    
    Not generated by kde-l10n:all
    
    Gbp-Dch: Ignore
---
 debian/control | 84 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index 66a6002..f2d9ae8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
-           Maximiliano Curia <maxy at debian.org>
+           Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 2.8.9~),
                debhelper (>= 9),
                extra-cmake-modules (>= 1.7.0),
@@ -20,47 +20,28 @@ Build-Depends: cmake (>= 2.8.9~),
                libkf5kdelibs4support-dev,
                libkf5khtml-dev,
                libkf5parts-dev,
-               qtwebengine5-dev | libqt5webengine5-dev,
                libqt5x11extras5-dev,
                libtidy-dev,
                libx11-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.4)
+               qtbase5-dev (>= 5.4),
+               qtwebengine5-dev | libqt5webengine5-dev,
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/konqueror.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/konqueror.git
 
-Package: konqueror
-Section: web
-Architecture: any
-Provides: info-browser, man-browser, www-browser
-Depends: dolphin, install-info, ${misc:Depends}, ${shlibs:Depends}
-Recommends: kfind
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
-Description: advanced file manager, web browser and document viewer
- Konqueror is the KDE web browser and advanced file manager.
- .
- Konqueror is a standards-compliant web browser, supporting HTML 4.01, Java,
- JavaScript, CSS3, and Netscape plugins such as Flash.
- .
- It supports advanced file management on local UNIX filesystems, with flexible
- views, network transparency, and embedded file viewing.
- .
- 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.
-
 Package: konq-plugins
 Architecture: any
 Depends: konqueror (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Enhances: konqueror
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+        kde-l10n-eo (<< 4:17.03.90-0~),
+        ${kde-l10n:all},
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+          kde-l10n-eo (<< 4:17.03.90-0~),
+          ${kde-l10n:all},
 Recommends: imagemagick
 Description: plugins for Konqueror, the KDE file/web/document browser
  This package contains a variety of useful plugins for Konqueror, the
@@ -95,15 +76,30 @@ Description: plugins for Konqueror, the KDE file/web/document browser
  .
  This package is part of the KDE base applications module.
 
-Package: libkf5konq6
-Section: libs
+Package: konqueror
+Section: web
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
-Description: core libraries for Konqueror
- This package contains libraries used by several KDE 4 applications,
- particularly Konqueror.
+Provides: info-browser, man-browser, www-browser
+Depends: dolphin, install-info, ${misc:Depends}, ${shlibs:Depends}
+Recommends: kfind
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+        kde-l10n-eo (<< 4:17.03.90-0~),
+        ${kde-l10n:all},
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+          kde-l10n-eo (<< 4:17.03.90-0~),
+          ${kde-l10n:all},
+Description: advanced file manager, web browser and document viewer
+ Konqueror is the KDE web browser and advanced file manager.
+ .
+ Konqueror is a standards-compliant web browser, supporting HTML 4.01, Java,
+ JavaScript, CSS3, and Netscape plugins such as Flash.
+ .
+ It supports advanced file management on local UNIX filesystems, with flexible
+ views, network transparency, and embedded file viewing.
+ .
+ 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.
 
@@ -116,3 +112,19 @@ Description: development files for the Konqueror libraries
  Konqueror libraries.
  .
  This package is part of the KDE base applications module.
+
+Package: libkf5konq6
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+        kde-l10n-eo (<< 4:17.03.90-0~),
+        ${kde-l10n:all},
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+          kde-l10n-eo (<< 4:17.03.90-0~),
+          ${kde-l10n:all},
+Description: core libraries for Konqueror
+ This package contains libraries used by several KDE 4 applications,
+ particularly Konqueror.
+ .
+ This package is part of the KDE base applications module.

-- 
konqueror packaging