[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f06f40d359b4b65c025c0193c8d942de7526470b
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:48 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90 [part 2]
    
    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.
    
    This changes applies more accurate heuristics to cover more binary packages.
---
 debian/control | 4 ++--
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 732a6cc..7abce82 100644
--- a/debian/control
+++ b/debian/control
@@ -106,8 +106,8 @@ Depends: plasma-framework,
          qml-module-qtquick-layouts,
          qml-module-qtquick2,
          ${misc:Depends}
-Breaks: marble (<= 4:15.08.0+dfsg-1)
-Replaces: marble (<= 4:15.08.0+dfsg-1)
+Breaks: marble (<= 4:15.08.0+dfsg-1), ${kde-l10n:all}
+Replaces: marble (<= 4:15.08.0+dfsg-1), ${kde-l10n:all}
 Description: data files for Marble
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 6001333..573e623
--- 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
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 

-- 
marble packaging