[SCM] okular packaging branch, master, updated. debian/16.08.2-1-75-g412778f

[Maximiliano Curia]

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

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

diff --git a/debian/control b/debian/control
index 751f263..800fe32 100644
--- a/debian/control
+++ b/debian/control
@@ -144,6 +144,8 @@ Suggests: ghostscript,
           poppler-data,
           texlive-binaries,
           unrar
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Recommends: okular
 Description: mobile support for Okular
  These plugins allow Okular to view additional document formats for mobile:
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 8eb0078..fb3bd01
--- 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

-- 
okular packaging