[SCM] kaddressbook packaging branch, master, updated. debian/16.04.3-1-78-gfe089ae

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 90ca7e7c444d94816a7c45de6051d9d46f81826d
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:12:59 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 | 6 +++---
 debian/rules   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index e4aecb8..0661ac2 100644
--- a/debian/control
+++ b/debian/control
@@ -105,10 +105,10 @@ Build-Depends: cmake (>= 2.8.12~),
                libx11-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtwebengine5-dev | libqt5webengine5-dev,
                qtbase5-dev (>= 5.5.0~),
                qtdeclarative5-dev (>= 5.4.0~),
                qttools5-dev (>= 5.5.0~),
+               qtwebengine5-dev | libqt5webengine5-dev,
                shared-mime-info,
                xsltproc,
                zlib1g-dev
@@ -120,8 +120,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kaddressbook.git
 Package: kaddressbook
 Section: utils
 Architecture: any
-Breaks: kontact (<< 4:16.11)
-Replaces: kontact (<< 4:16.11)
+Breaks: kontact (<< 4:16.11), ${kde-l10n:all}
+Replaces: kontact (<< 4:16.11), ${kde-l10n:all}
 Depends: libkf5akonadisearch-bin,
          libkf5akonadisearch-plugins,
          ${misc:Depends},
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index f4900ec..731f16a
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 KDEPIM_RUNTIME_VERSION = 4:15.07.90
 
 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
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 

-- 
kaddressbook packaging