[SCM] KDE Localization module packaging branch, experimental, updated. debian/4%16.04.3-11-22-g6a9e840

Pino Toscano pino at moszumanska.debian.org
Thu Jan 11 07:56:06 UTC 2018


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

The following commit has been merged in the experimental branch:
commit 6a9e840bb443d73d9ac0fac5029b60290db5559a
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jan 11 08:53:12 2018 +0100

    drop old breaks/replaces
---
 debian/changelog | 2 ++
 debian/rules     | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27c47d2..e018045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kde-l10n (4:17.08.3-3) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Merge changes in 4:16.04.3-9, 4:16.04.3-10, and 4:16.04.3-11.
     (Closes: #886857)
+  * Remove the okular-l10n, konq-plugins-l10n, and all the PIM-related
+    breaks/replaces, since their translations are no more shipped here.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Jan 2018 08:45:02 +0100
 
diff --git a/debian/rules b/debian/rules
index d98171d..ecfbb95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,15 +12,10 @@ endif
 L10N_Depends := libkdecore5 (>= 4:4.10)
 L10N_Recommends :=
 L10N_Suggests := kde-standard
-L10N_Replaces := okular-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, konq-plugins-l10n, ktouchpadenabler (<< 4:4.10.4), kio-mtp (<< 0.75+git20140304-2), digikam-data (<< 4:4.14.0-1)
+L10N_Replaces := ktouchpadenabler (<< 4:4.10.4), kio-mtp (<< 0.75+git20140304-2), digikam-data (<< 4:4.14.0-1)
+L10N_Breaks := 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)
-OLD_KDEPIM_WITH_L10N := kdepim-groupware (<< 4:4.10.2), kdepim-kresources (<< 4:4.10.2), kdepim-wizards (<< 4:4.10.2), kjots (<< 4:4.10.2), knode (<< 4:4.10.2), ktimetracker (<< 4:4.10.2), libkdepim4 (<< 4:4.10.2), libkleo4 (<< 4:4.10.2), libkpgp4 (<< 4:4.10.2), libksieve4 (<< 4:4.10.2), libmessagecore4 (<< 4:4.10.2), libmessagelist4 (<< 4:4.10.2), libmessageviewer0 (<< 4:4.10.2)
-L10N_Replaces := $(L10N_Replaces), $(OLD_KDEPIM_WITH_L10N)
-L10N_Breaks := $(L10N_Breaks), $(OLD_KDEPIM_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



More information about the pkg-kde-commits mailing list