[SCM] keditbookmarks packaging branch, master, updated. ecef003c47b730ffceaf02a89f112fbba5176676

[Maximiliano Curia]

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

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

diff --git a/debian/control b/debian/control
index a6614cd..7384169 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Section: utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: kde-baseapps-bin
-Replaces: kde-baseapps-bin
+Breaks: ${kde-l10n:all}
+Replaces: kde-baseapps-bin, ${kde-l10n:all}
 Description: Bookmark Editor utility
  KEditBookMarks can edit your bookmark file.
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 05e5a33..16d3c80
--- 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
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='keditbookmarks-dbg (<= 4:15.12.1-1~~)'

-- 
keditbookmarks packaging