[SCM] extra-cmake-modules packaging branch, master, updated. debian/5.37.0-2-89-geea6c57

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:24:34 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=087d049

The following commit has been merged in the master branch:
commit 087d049aa90c631939a9d9be15bcc932e50ae346
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Dec 11 14:43:44 2017 +0100

    Use linktree to drop jquery and underscore
---
 debian/control   |  1 +
 debian/linktrees |  2 ++
 debian/rules     | 10 ++--------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 3d71442..a11e4fe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
+               dh-linktree,
                debhelper (>= 9),
                libjs-jquery,
                libjs-underscore,
diff --git a/debian/linktrees b/debian/linktrees
new file mode 100644
index 0000000..74de9a1
--- /dev/null
+++ b/debian/linktrees
@@ -0,0 +1,2 @@
+replace usr/share/javascript/jquery/jquery.js usr/share/doc/ECM/html/_static/jquery.js
+replace usr/share/javascript/underscore/underscore.js usr/share/doc/ECM/html/_static/underscore.js
diff --git a/debian/rules b/debian/rules
index f3581c5..37a278e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-override_dh_install:
-	$(overridden_command)
-	rm debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/jquery.js
-	ln -s /usr/share/javascript/jquery/jquery.js debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/jquery.js
-	rm debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/underscore.js
-	ln -s /usr/share/javascript/underscore/underscore.js debian/extra-cmake-modules/usr/share/doc/ECM/html/_static/underscore.js
+%:
+	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --with linktree
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
extra-cmake-modules packaging



More information about the pkg-kde-commits mailing list