[SCM] plasma-workspace packaging branch, master, updated. cf7358285a570363c8b18174d4500aaa572dd427

Maximiliano Curia maxy at moszumanska.debian.org
Sun Jul 5 06:32:57 UTC 2015


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

The following commit has been merged in the master branch:
commit 0fc744eb28d1f55bb15b6ed51291ab0b8b2fd75d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 13:51:44 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 0575e35..fb24fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 plasma-workspace (4:5.3.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Add the missing Breaks/Replaces.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 13:48:17 +0200
 
diff --git a/debian/control b/debian/control
index e80071b..6a89944 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Build-Depends: baloo-kf5-dev (>= 5.1~),
                libxrender-dev,
                lm-sensors,
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools (>= 0.15.18~),
                plasma-framework-dev (>= 5.8.0~),
                qtbase5-dev (>= 5.4.0~),
                qtdeclarative5-dev (>= 5.4.0~),
@@ -130,8 +130,10 @@ Depends: dbus-x11,
          x11-xserver-utils,
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: ${kde-l10n:all}
 Conflicts: kde-window-manager, kde-workspace, kde-workspace-data, klipper
-Replaces: klipper, plasma-workspace-data
+Replaces: klipper, plasma-workspace-data,
+          ${kde-l10n:all}
 Description: Plasma Workspace for KF5
  Plasma Workspace for KF5. Workspaces provide
  support for KDE Plasma Widgets, integrated search,
diff --git a/debian/rules b/debian/rules
index b96cf39..f31d6d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
+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
 libpkgs_addsubst_allLibraries = plasma-workspace-dev
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 

-- 
plasma-workspace packaging



More information about the pkg-kde-commits mailing list