[SCM] khelpcenter packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-35-g9a6c755

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 9df71ca06ce42cbc76d893cd2314a2b2952c2b70
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Dec 11 01:20:50 2015 +0100

    Fix merge, drop the kde-l10n substvar, not valid with frameworks
---
 debian/control | 6 ++----
 debian/rules   | 7 -------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index f2a7632..ae22a2d 100644
--- a/debian/control
+++ b/debian/control
@@ -26,11 +26,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),
-        ${kde-l10n:all}
+        khelpcenter4 (<< 4:5.0.0)
 Replaces: khelpcenter-data (<< 4:5.0.0-0ubuntu1~ubuntu14.10~ppa2),
-          khelpcenter4 (<< 4:5.0.0),
-          ${kde-l10n:all}
+          khelpcenter4 (<< 4:5.0.0)
 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 8ee2bdf..6fdbcb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,6 @@
 # -*- makefile -*-
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-<<<<<<< HEAD
-=======
-
-# 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
->>>>>>> master
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=khelpcenter-dbg

-- 
khelpcenter packaging