[SCM] plasma-desktop packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%5.4.3-0ubuntu1-9-g01a3926

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=ad6d556

The following commit has been merged in the kubuntu_xenial_archive branch:
commit ad6d556f0aac0c58574623e63db3df37adf7b71b
Author: Philip Muškovac <yofel at gmx.net>
Date:   Wed Jan 6 16:51:54 2016 +0100

    plasma-desktop-data breaks/replaces kde-l10n:all << 4:15.08.3-0ubuntu1~
---
 debian/changelog | 3 +++
 debian/control   | 6 ++++--
 debian/rules     | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f754d62..0871655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ plasma-desktop (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
   [ Clive Johnston ]
   * new upstream release
 
+  [ Philip Muškovac ]
+  * plasma-desktop-data breaks/replaces kde-l10n:all << 4:15.08.3-0ubuntu1~
+
  -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:50:46 +0000
 
 plasma-desktop (4:5.4.3-0ubuntu1) xenial; urgency=medium
diff --git a/debian/control b/debian/control
index 7003d83..6d2e9b4 100644
--- a/debian/control
+++ b/debian/control
@@ -215,11 +215,13 @@ Conflicts: kde-workspace-bin, kde-workspace-data
 Breaks: baloo-kf5 (<< 5.5),
         kde-config-touchpad (<< ${source:Version}),
         kde-touchpad (<< ${source:Version}),
-        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+        plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+        ${kde-l10n:all}
 Replaces: baloo-kf5 (<< 5.5),
           kde-config-touchpad (<< ${source:Version}),
           kde-touchpad (<< ${source:Version}),
-          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
+          plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+          ${kde-l10n:all}
 Description: Tools and widgets for the desktop data files
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
diff --git a/debian/rules b/debian/rules
index 8c234e1..aeba496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+l10npkgs_firstversion_ok := 4:15.08.3-0ubuntu1~
+
 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) --dbg-package=plasma-desktop-dbg

-- 
plasma-desktop packaging