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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1851096e57c8cfbc0afe0fdfb6dfc778a1f2becc
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:07 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90
    
    In Applications 17.03.90 for all KF5 based applications the translations moved
    from the separate kde-l10n-$lang packages to the respective application tarball.
    
    To aid in a smooth transition we mass confict unsuitably old versions using
    the l10n-packages.mk's ${kde-l10n:all} substvar.
    
    This change was done by a bot trying to only introduce a relationship iff
    a binary package actually contains locales.
---
 debian/control | 4 ++++
 debian/rules   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/debian/control b/debian/control
index 119e345..eb847ee 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,8 @@ Package: konq-plugins
 Architecture: any
 Depends: konqueror, ${misc:Depends}, ${shlibs:Depends}
 Enhances: konqueror
+Breaks: ${kde-l10n:all}
+Replaces: ${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,6 +97,8 @@ Package: libkf5konq6
 Section: libs
 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.
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index da68011..82260fd
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
konqueror packaging