[SCM] cantor packaging branch, master, updated. debian/16.08.3-1-58-g402e113

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f8f763d71561324ec8852858100d7ab1bdd60d8c
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:12:57 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 83f1611..2c9fdb1 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,8 @@ Suggests: cantor-backend-kalgebra,
           cantor-backend-python3,
           cantor-backend-r,
           cantor-backend-sage
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: interface for mathematical applications
  Cantor is an application to allow you to you use your favorite mathematical
  applications from within an elegant worksheet interface. It provides dialogs
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 23e1d20..4ef51d4
--- 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 = cantor
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 

-- 
cantor packaging