[SCM] plasma-desktop packaging branch, master, updated. 177b98b29fbfbd8312edc57c06ba7f9254196299

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1ed8e6eb61270872b91321593a743d0b20bacafb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 14:00:01 2015 +0200

    Add the missing Breaks/Replaces.
---
 debian/changelog | 2 +-
 debian/control   | 8 +++++---
 debian/rules     | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 337092d..2129f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 plasma-desktop (4:5.3.2-2~1) UNRELEASED; urgency=medium
 
-  * 
+  * Add the missing Breaks/Replaces.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 13:55:44 +0200
 
diff --git a/debian/control b/debian/control
index 08d64f5..ee45ebe 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends: baloo-kf5-dev (>= 5.1.95),
                libxi-dev,
                libxkbfile-dev,
                openbox,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools (>= 0.15.18~),
                plasma-framework-dev (>= 5.9.0~),
                plasma-workspace-dev (>= 4:5.2.2),
                qtbase5-dev (>= 5.4.0~),
@@ -202,9 +202,11 @@ Recommends: plasma-framework,
             qml-module-qtquick-dialogs
 Conflicts: kde-workspace-bin, kde-workspace-data
 Breaks: baloo-kf5 (<< 5.5),
-        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),
-          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..a75ca4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+l10npkgs_firstversion_ok := 4:4.14.0-2
+
 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