[SCM] KDE Localization module packaging branch, master, updated. debian/4%16.04.3-6-6-g9d2725c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 9d2725c58305f959d330b0a154c545ef7885197b
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 9 10:12:35 2017 +0100

    drop telepathy breaks/replaces
---
 debian/changelog | 2 ++
 debian/rules     | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1390f0..731fe05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ kde-l10n (4:16.04.3-7) UNRELEASED; urgency=medium
       kioslave5/tar, kioslave5/thumbnail, kioslave5/xz, ktouch, kompare,
       okteta, and marble
   * Drop the old data of kajongg, as they are not useful anymore.
+  * Remove breaks/replaces against telepathy packages, since its translations
+    are not shipped anymore.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Dec 2017 17:29:12 +0100
 
diff --git a/debian/rules b/debian/rules
index e3339f1..4798a96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,6 @@ 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 := 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), plasma-runner-telepathy-contact (<< 15.04), kde-telepathy-send-file (<< 15.04), kde-telepathy-filetransfer-handler (<< 15.04), kde-telepathy-contact-list (<< 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