[SCM] kdepim-addons packaging branch, master, updated. debian/16.04.3-1-80-gcad3866

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdepim-addons.git;a=commitdiff;h=278a56f

The following commit has been merged in the master branch:
commit 278a56f95d496e8d315003755406c97f5997cc7f
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:02 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, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 17ff2aa..578e29f 100644
--- a/debian/control
+++ b/debian/control
@@ -55,12 +55,14 @@ Breaks: kaddressbook (<= 4:16.04),
         kmail (<= 4:16.08),
         korganizer (<= 4:16.04),
         libkf5messageviewer5 (<< 4:16.12.0),
-        libkf5pimcommon5 (<= 4:16.04)
+        libkf5pimcommon5 (<= 4:16.04),
+        ${kde-l10n:all}
 Replaces: kaddressbook (<= 4:16.04),
           kmail (<= 4:16.08),
           korganizer (<= 4:16.04),
           libkf5messageviewer5 (<< 4:16.12.0),
-          libkf5pimcommon5 (<= 4:16.04)
+          libkf5pimcommon5 (<= 4:16.04),
+          ${kde-l10n:all}
 Description: Addons for KDE PIM applications
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index a70b8f9..a2b980f
--- 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_install:
 	$(overridden_command) --destdir=debian/tmp

-- 
kdepim-addons packaging