[SCM] kompare packaging branch, master, updated. debian/16.08.0-1-42-gde0fd48

[Maximiliano Curia]

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

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

diff --git a/debian/control b/debian/control
index 1a1d54c..2cffdb1 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,8 @@ Depends: kpart5-kompare (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: khelpcenter
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: file difference viewer
  Kompare displays the differences between files.  It can compare the
  contents of files or directories, as well as create, display, and merge patch
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

-- 
kompare packaging