[SCM] kleopatra packaging branch, master, updated. debian/16.04.2-2-48-gcae2709

[Maximiliano Curia]

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

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

diff --git a/debian/control b/debian/control
index 5ea0a1c..92acdff 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kleopatra.git
 Package: kleopatra
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kdepim-doc (<= 4:16.04)
-Replaces: kdepim-doc (<= 4:16.04)
+Breaks: kdepim-doc (<= 4:16.04), ${kde-l10n:all}
+Replaces: kdepim-doc (<= 4:16.04), ${kde-l10n:all}
 Description: Certificate Manager and Unified Crypto GUI
  Kleopatra is a certificate manager and a universal crypto GUI. It supports
  managing X.509 and OpenPGP certificates in the GpgSM keybox and retrieving
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 3cad390..db6a515
--- 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:
 	rm -f debian/tmp/usr/lib/*/libkleopatraclientcore.so

-- 
kleopatra packaging