[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:25 UTC 2018


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

The following commit has been merged in the master branch:
commit 4fe6c6822ae7ddd04841fc4e7d92660bcdea44cd
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Dec 15 13:35:30 2015 +0000

    keep lintian happy
---
 debian/.gitattributes | 1 -
 debian/control        | 5 ++++-
 debian/rules          | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/control b/debian/control
index e2a07e1..12ad243 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,13 @@
 Source: extra-cmake-modules
 Section: libs
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+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~),
                debhelper (>= 9),
+               libjs-jquery,
+               libjs-underscore,
                pkg-kde-tools (>= 0.15.16~),
                python3-sphinx,
                qttools5-dev (>= 5.4),
diff --git a/debian/rules b/debian/rules
index b33a5ae..f3581c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,13 @@
 
 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
+
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:

-- 
extra-cmake-modules packaging



More information about the pkg-kde-commits mailing list