[SCM] akonadi-mime packaging branch, master, updated. 064c4163e44c59ecb452f81b88032eb8a4bd228c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-mime.git;a=commitdiff;h=6f9ee33

The following commit has been merged in the master branch:
commit 6f9ee3372e967e464d65a130a22fc8ddbb1792f8
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:42 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 78f5278..6e27e18 100644
--- a/debian/control
+++ b/debian/control
@@ -89,12 +89,14 @@ Breaks: kdepimlibs-data,
         libkf5akonadicontact5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadisocialutils5 (<< 4:15.07.90+git20150819.1000),
-        libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000)
+        libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
+        ${kde-l10n:all}
 Replaces: kdepimlibs-data,
           libakonadi-kf5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadicontact5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadisocialutils5 (<< 4:15.07.90+git20150819.1000),
-          libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000)
+          libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
+          ${kde-l10n:all}
 Description: akonadi-mime - data files
  This package contains data files for akonadi-mime library
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b5a9dc2..233d1dc
--- 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

-- 
akonadi-mime packaging