[SCM] ktexteditor packaging branch, master, updated. debian/5.37.0-2-9-g88b8bc5

Maximiliano Curia maxy at moszumanska.debian.org
Thu Dec 14 12:49:17 UTC 2017


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

The following commit has been merged in the master branch:
commit 88b8bc5b95876334a576b069cb4d60cf30d160d4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 14 09:41:06 2017 -0300

    Replace underscore using linktrees
---
 debian/control                    |  2 ++
 debian/ktexteditor-data.links     |  1 -
 debian/ktexteditor-data.linktrees |  1 +
 debian/rules                      | 12 +++---------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index caab133..db55fd7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,14 @@ 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,
                kio-dev (>= 5.26.0~),
                libeditorconfig-dev,
                libgit2-dev (>= 0.22.0~),
+               libjs-underscore,
                libkf5archive-dev (>= 5.41.0~),
                libkf5config-dev (>= 5.41.0~),
                libkf5guiaddons-dev (>= 5.41.0~),
diff --git a/debian/ktexteditor-data.links b/debian/ktexteditor-data.links
deleted file mode 100644
index 958ec5a..0000000
--- a/debian/ktexteditor-data.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/underscore/underscore.js usr/share/katepart5/script/libraries/underscore.js
diff --git a/debian/ktexteditor-data.linktrees b/debian/ktexteditor-data.linktrees
new file mode 100644
index 0000000..e31320e
--- /dev/null
+++ b/debian/ktexteditor-data.linktrees
@@ -0,0 +1 @@
+replace usr/share/javascript/underscore/underscore.js usr/share/katepart5/script/libraries/underscore.js
diff --git a/debian/rules b/debian/rules
index 3d51c26..720efa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,12 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-override_dh_auto_configure:
-	$(overridden_command) -- -DBUILD_QCH=ON
+%:
+	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --with linktree
 
 override_dh_strip:
-	$(overridden_command) --dbgsym-migration='libkf5texteditor5-dbg (<= 5.19.0-1~~)'
+	dh_strip --dbgsym-migration='libkf5texteditor5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:
-
-override_dh_install:
-	rm -f debian/ktexteditor-data/usr/share/katepart5/script/libraries/underscore.js
-	$(overridden_command)

-- 
ktexteditor packaging



More information about the pkg-kde-commits mailing list