[SCM] korganizer packaging branch, master, updated. debian/16.04.3-1-80-g7011fc2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 277a3978ea04a102372008b78a8f493e1d3b1130
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:08 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 de2fe97..5fd0793 100644
--- a/debian/control
+++ b/debian/control
@@ -107,10 +107,12 @@ Depends: kdepim-runtime, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Homepage: http://kontact.kde.org/korganizer/
 Breaks: kdepim-doc (<< 4:16.12.0),
         kontact (<< 4:4.13.3-2),
-        libkdepim4 (<< 4:4.14.10-3)
+        libkdepim4 (<< 4:4.14.10-3),
+        ${kde-l10n:all}
 Replaces: kdepim-doc (<< 4:16.12.0),
           kontact (<< 4:4.13.3-2),
-          libkdepim4 (<< 4:4.14.10-3)
+          libkdepim4 (<< 4:4.14.10-3),
+          ${kde-l10n:all}
 Description: calendar and personal organizer
  This package contains KOrganizer, a calendar and scheduling program.
  .
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 280580e..df8b880
--- 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
 

-- 
korganizer packaging