[SCM] knotes packaging branch, master, updated. debian/16.04.3-1-77-g9315793

[Maximiliano Curia]

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

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

diff --git a/debian/control b/debian/control
index 06e28bf..477e62d 100644
--- a/debian/control
+++ b/debian/control
@@ -90,8 +90,8 @@ Depends: kdepim-runtime,
          libkf5akonadisearch-plugins,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kdepim-doc (<< 4:16.12.0), knode (<< 4:4.14.5)
-Replaces: kdepim-doc (<< 4:16.12.0), knode (<< 4:4.14.5)
+Breaks: kdepim-doc (<< 4:16.12.0), knode (<< 4:4.14.5), ${kde-l10n:all}
+Replaces: kdepim-doc (<< 4:16.12.0), knode (<< 4:4.14.5), ${kde-l10n:all}
 Description: sticky notes application
  KNotes is a program that lets you write sticky notes. The notes are saved
  automatically when you exit the program, and they display when you open the
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 6df03e3..bf2a548
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 KDEPIM_RUNTIME_VERSION = 4:15.07.90
 
 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
 

-- 
knotes packaging