[SCM] KDE Localization module packaging branch, master, updated. debian/16.04.2-2-4-g856d8b7

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-l10n.git;a=commitdiff;h=856d8b7

The following commit has been merged in the master branch:
commit 856d8b7d246cd08dba514aba08764e4922b6921b
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 3 16:47:18 2016 +0200

    deal with more translation moves (#829451)
---
 debian/changelog | 10 ++++++++--
 debian/rules     |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7715792..09caf13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 kde-l10n (4:16.04.2-3) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
-  * Break/replace kdenlive-data < 15.04, since the kdenlive translations moved
-    from there. (Closes: #828923)
   * Make sure all the languages have the common breaks/replaces variables:
     add them for ast, eo, and id.
+  * Add Breaks/Replaces against old versions of packages providing
+    translations moved there: (Closes: #828923, #829451)
+    - packages of applications now part of Application releases:
+      kdenlive-data, kde-telepathy-data, kde-config-telepathy-accounts,
+      kde-telepathy-text-ui, kde-telepathy-integration-module,
+      kde-telepathy-approver, kde-telepathy-auth-handler
+    - kio-mtp
+    - digikam-data (for libkgeomap)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 29 Jun 2016 21:43:20 +0200
 
diff --git a/debian/rules b/debian/rules
index f58c59e..7907667 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ endif
 L10N_Depends := libkf5i18n5 | libkdecore5 (>= 4:4.10)
 L10N_Recommends :=
 L10N_Suggests := kde-standard
-L10N_Replaces := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n, ktouchpadenabler (<< 4:4.10.4), kdenlive-data (<< 15.04)
-L10N_Breaks := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n, ktouchpadenabler (<< 4:4.10.4), kdenlive-data (<< 15.04)
+L10N_Replaces := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n, ktouchpadenabler (<< 4:4.10.4), kio-mtp (<< 0.75+git20140304-2), digikam-data (<< 4:4.14.0-1)
+L10N_Breaks := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n, ktouchpadenabler (<< 4:4.10.4), kio-mtp (<< 0.75+git20140304-2), digikam-data (<< 4:4.14.0-1)
 L10N_Provides := kde-l10n
 
 # Handling of conflicts against kdepim 4.4 (which provides translations)
@@ -21,6 +21,11 @@ OLD_KDEPIM_WITH_L10N := akregator (<< 4:4.10.2), blogilo (<< 4:4.10.2), kaddress
 L10N_Replaces := $(L10N_Replaces), $(OLD_KDEPIM_WITH_L10N)
 L10N_Breaks := $(L10N_Breaks), $(OLD_KDEPIM_WITH_L10N)
 
+# Handling of conflicts against pre-Applications packages
+OLD_PKGS_WITH_L10N := kdenlive-data (<< 15.04), kde-telepathy-data (<< 15.04), kde-config-telepathy-accounts (<< 15.04), kde-telepathy-text-ui (<< 15.04), kde-telepathy-integration-module (<< 15.04), kde-telepathy-approver (<< 15.04), kde-telepathy-auth-handler (<< 15.04)
+L10N_Replaces := $(L10N_Replaces), $(OLD_PKGS_WITH_L10N)
+L10N_Breaks := $(L10N_Breaks), $(OLD_PKGS_WITH_L10N)
+
 L10N_PREFIX := kde-l10n
 #L10N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*//')
 L10N_LANGS := $(filter-out debian,$(subst ./,,$(shell find . -mindepth 1 -maxdepth 1 -type d ! -name .pc ! -name .git)))

-- 
KDE Localization module packaging