[SCM] kgeography packaging branch, master, updated. debian/16.08.0-1-36-g33c157f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kgeography.git;a=commitdiff;h=2e1d4fc

The following commit has been merged in the master branch:
commit 2e1d4fc242fbc036cc1541cf2f7134f986a936a2
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:04 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 e2e9f3c..6c95229 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,8 @@ Package: kgeography-data
 Architecture: all
 Section: misc
 Depends: ${misc:Depends}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: data files for KGeography
  This package contains architecture-independent data files for the
  KGeography geography learning tool, including maps, capitals, and flags.
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b57f3e9..a196c56
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/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

-- 
kgeography packaging