[SCM] khelpcenter packaging branch, master, updated. debian/5.3.2-1-2-g61fd52c

[Didier Raboud]

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

The following commit has been merged in the master branch:
commit 329845dbbab2ffad5242c868cae4e2856f670abb
Author: Didier Raboud <odyx at debian.org>
Date:   Fri Jul 3 01:11:09 2015 +0200

    Add versionned Breaks/Replaces against all kde-l10n packages in jessie, as this package now ships its own translations
    
    - Bump Build-Depends against pkg-kde-tools to 0.15.18~
    - Use its new l10n-packages.mk with a kde-l10n fixed version 4:4.14.0-2~
    
    Closes: #790779
    Closes: #790861
---
 debian/changelog | 10 ++++++++++
 debian/control   |  6 +++---
 debian/rules     |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d79a3f..2ee78a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+khelpcenter (4:5.3.2-2) UNRELEASED; urgency=medium
+
+  * Add versionned Breaks/Replaces against all kde-l10n packages in
+    jessie, as this package now ships its own translations
+    - Bump Build-Depends against pkg-kde-tools to 0.15.18~
+    - Use its new l10n-packages.mk with a kde-l10n fixed version 4:4.14.0-2~
+    (Closes: #790779, #790861)
+
+ -- Didier Raboud <odyx at debian.org>  Fri, 03 Jul 2015 01:05:43 +0200
+
 khelpcenter (4:5.3.2-1) unstable; urgency=medium
 
   * New upstream release (5.3.2).
diff --git a/debian/control b/debian/control
index d28ce77..fe404ed 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,9 @@ 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..75b4363 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+# Add kde-l10n:all substvar
+l10npkgs_firstversion_ok := 4:4.14.0-2~
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=khelpcenter-dbg

-- 
khelpcenter packaging