[SCM] ktexteditor packaging branch, master, updated. debian/5.37.0-2-11-g04d5680

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktexteditor.git;a=commitdiff;h=04d5680

The following commit has been merged in the master branch:
commit 04d568064ebec381e807732c630f30117dfe5c9c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 14 12:14:55 2017 -0300

    Use system copy of underscore.js for the embedded resources
---
 debian/control                    | 1 -
 debian/ktexteditor-data.linktrees | 1 -
 debian/rules                      | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index db55fd7..2afa1ee 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 3.0~),
                debhelper (>= 9),
-               dh-linktree,
                doxygen,
                extra-cmake-modules (>= 5.41.0~),
                graphviz,
diff --git a/debian/ktexteditor-data.linktrees b/debian/ktexteditor-data.linktrees
deleted file mode 100644
index e31320e..0000000
--- a/debian/ktexteditor-data.linktrees
+++ /dev/null
@@ -1 +0,0 @@
-replace usr/share/javascript/underscore/underscore.js usr/share/katepart5/script/libraries/underscore.js
diff --git a/debian/rules b/debian/rules
index 7cc92d6..95827d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,14 @@
 # -*- makefile -*-
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --with linktree
+	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DBUILD_QCH=ON
+	# ktexteditor embeds underscore.js in the generated lib
+	# (through a qt resource)
+	-ln -sf /usr/share/javascript/underscore/underscore.js src/script/data/libraries/emmet/lib.js
+	-ln -sf /usr/share/javascript/underscore/underscore.js src/script/data/libraries/underscore.js
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5texteditor5-dbg (<= 5.19.0-1~~)'

-- 
ktexteditor packaging