[SCM] ktp-text-ui packaging branch, master, updated. debian/17.08.1-1-9-gaf13791

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2ef9a73

The following commit has been merged in the master branch:
commit 2ef9a7302909b1de668921957302f18327c586bb
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 3 15:36:02 2017 +0100

    simplify jquery.js replacement
---
 debian/changelog                       | 6 ++++++
 debian/control                         | 2 --
 debian/kde-telepathy-text-ui.linktrees | 1 -
 debian/rules                           | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42209d6..709fea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ ktp-text-ui (17.08.3-0r1) UNRELEASED; urgency=medium
     - libtelepathy-qt5-dev to >= 0.9.7
   * Remove unused build dependencies: libkf5wallet-dev, libkf5webkit-dev,
     libqjson-dev, libqt5webkit5-dev, and libqtwebkit-dev.
+  * Simplify the way any bindled jquery.js is replaced with a symlink to the
+    system version: dynamically search and replace any file, instead of
+    maintaining a static list
+    - drop the usage of dh_linktree, and the dh-linktree build dependency
+    - remove the libjs-jquery build dependency, as it is not needed during
+      build
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Dec 2017 15:19:33 +0100
 
diff --git a/debian/control b/debian/control
index 5ff0801..6dadcbf 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,7 @@ Uploaders: Diane Trout <diane at ghic.org>,
            Mark Purcell <msp at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
-               dh-linktree,
                extra-cmake-modules (>= 1.3.0~),
-               libjs-jquery,
                libkf5archive-dev,
                libkf5dbusaddons-dev,
                libkf5emoticons-dev (>= 5.16-2),
diff --git a/debian/kde-telepathy-text-ui.linktrees b/debian/kde-telepathy-text-ui.linktrees
deleted file mode 100644
index 0f24b8e..0000000
--- a/debian/kde-telepathy-text-ui.linktrees
+++ /dev/null
@@ -1 +0,0 @@
-replace usr/share/javascript/jquery/jquery.js usr/share/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/jquery.js
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index ab82b1a..9bfae31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,6 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='kde-telepathy-text-ui-dbg (<= 15.12.1-1~~)'
 
-override_dh_install:
+override_dh_auto_install:
 	$(overridden_command)
-	dh_linktree
+	find debian/kde-telepathy-text-ui -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;

-- 
ktp-text-ui packaging