[SCM] khelpcenter packaging branch, master, updated. debian/5.3.2-2-4-g5b8cc40

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jul 3 15:22:21 UTC 2015


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

The following commit has been merged in the master branch:
commit 4af5f4c4232bd456a39d7eda8185f5ee4eada785
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 12:54:16 2015 +0200

    Add the missing Breaks/Replaces. (Closes: #790861, #790799)
---
 debian/changelog | 2 +-
 debian/control   | 8 +++++---
 debian/rules     | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50dd5bc..e42c558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 khelpcenter (4:5.3.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Add the missing Breaks/Replaces. (Closes: #790861, #790799)
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 12:52:26 +0200
 
diff --git a/debian/control b/debian/control
index d28ce77..cebcd74 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5kcmutils-dev (>= 5.2.0),
                libkf5kdelibs4support-dev (>= 5.2.0),
                libkf5khtml-dev (>= 5.2.0),
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.15.18~),
                qtbase5-dev (>= 5.4.0~)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/kde/workspace/khelpcenter
@@ -23,9 +23,11 @@ Package: khelpcenter
 Architecture: any
 Depends: kdoctools5, ${misc:Depends}, ${shlibs:Depends}
 Breaks: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2),
-        khelpcenter4 (<< 4:5.0.0)
+        khelpcenter4 (<< 4:5.0.0),
+        ${kde-l10n:all}
 Replaces: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2),
-          khelpcenter4 (<< 4:5.0.0)
+          khelpcenter4 (<< 4:5.0.0),
+          ${kde-l10n:all}
 Description: KDE documentation viewer
  KHelpCenter uses meta data files which describe the documentation
  available in the system. Each document is represented by a meta data
diff --git a/debian/rules b/debian/rules
index 56f21ed..070fdb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+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=khelpcenter-dbg

-- 
khelpcenter packaging



More information about the pkg-kde-commits mailing list