[SCM] khotkeys packaging branch, master, updated. 51ae0b54b97b1adf5404ce5a5e4aecc838b6d6c0

Maximiliano Curia maxy at moszumanska.debian.org
Sun Jul 5 06:31:52 UTC 2015


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

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

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

diff --git a/debian/changelog b/debian/changelog
index ebb5832..d8ca944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 khotkeys (4:5.3.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Add the missing Breaks/Replaces.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 13:53:31 +0200
 
diff --git a/debian/control b/debian/control
index fe79ec0..23229c3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5xmlgui-dev (>= 5.2.0),
                libqt5x11extras5-dev (>= 5.4.0~),
                libx11-dev,
-               pkg-kde-tools (>= 0.15.16),
+               pkg-kde-tools (>= 0.15.18~),
                plasma-framework-dev (>= 5.2.0),
                plasma-workspace-dev (>= 4:5.2.2),
                qtbase5-dev (>= 5.4)
@@ -52,6 +52,8 @@ Description: configure input actions settings
 Package: khotkeys-data
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: configure input actions settings
  Configure input actions settings in Plasma.
  .
diff --git a/debian/rules b/debian/rules
index 441e2b4..69c5d5f 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=khotkeys-dbg

-- 
khotkeys packaging



More information about the pkg-kde-commits mailing list