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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5b8cc405e8687f32c8e0d8b1af16e9fd19bdc318
Merge: 5dd4feaf4a94aed0712d64b7cfaccff7dc4307c1 61fd52cccbd4549bccf97732a1b94c7d5b61b188
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 17:20:50 2015 +0200

    Merge branch 'master' of git://git.debian.org/git/pkg-kde/plasma/khelpcenter
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 8 ++++++--
 debian/control   | 6 ++----
 debian/rules     | 5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --cc debian/rules
index 070fdb5,75b4363..44784f9
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,10 +1,10 @@@
  #!/usr/bin/make -f
  # -*- makefile -*-
  
- l10npkgs_firstversion_ok := 4:4.14.0-2
- 
 -include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 +include /usr/share/pkg-kde-tools/qt-kde-team/3/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:

-- 
khelpcenter packaging