[SCM] kmail packaging branch, master, updated. debian/16.04.3-1-115-g2204e19

[Maximiliano Curia]

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

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

    Mass conflict/break kde-l10n < 17.03.90 [part 2]
    
    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.
    
    This changes applies more accurate heuristics to cover more binary packages.
---
 debian/control | 6 ++++--
 debian/rules   | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 78cc19e..481693e 100644
--- a/debian/control
+++ b/debian/control
@@ -165,14 +165,16 @@ Breaks: kdepim-doc (<< 4:16.12.0),
         libkdepim4 (<< 4:4.13.90),
         libkf5libkdepim5 (<= 4:16.04),
         libkf5messageviewer5 (<= 4:16.04),
-        libmessageviewer4 (<< 4:4.13.90)
+        libmessageviewer4 (<< 4:4.13.90),
+        ${kde-l10n:all}
 Replaces: kdepim-doc (<< 4:16.12.0),
           kontact (<< 4:16.11),
           ktnef (<< 4:16.12.0),
           libkdepim4 (<< 4:4.13.90),
           libkf5libkdepim5 (<= 4:16.04),
           libkf5messageviewer5 (<= 4:16.04),
-          libmessageviewer4 (<< 4:4.13.90)
+          libmessageviewer4 (<< 4:4.13.90),
+          ${kde-l10n:all}
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 979b8a8..8106ca5
--- 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
 

-- 
kmail packaging