[SCM] libaccounts-qt packaging branch, master, updated. 664b627f74c6cbde0ba011f22f925961ca76e400

Diane Trout diane at moszumanska.debian.org
Fri Sep 4 06:05:47 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libaccounts-qt.git;a=commitdiff;h=664b627

The following commit has been merged in the master branch:
commit 664b627f74c6cbde0ba011f22f925961ca76e400
Author: Diane Trout <diane at ghic.org>
Date:   Thu Sep 3 23:05:24 2015 -0700

    Replace convience copy of jquery.js with link to system version
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 547af79..ed2ae09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libaccounts-qt (1.13+20150813-1~) UNRELEASED; urgency=medium
   * Use upstream snapshot 207139e65e6707100d2e92d96b1a4c3bfaa88a5f
   * Prepare Debian release (1.13+20150813)
   * Add symbols files for libaccounts-qt1 and libaccounts-qt5-1
+  * Replace convience copy of jquery.js with link to system version
   * Add myself to uploaders.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 22:39:36 +0200
diff --git a/debian/control b/debian/control
index f29836d..1fce494 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Maximiliano Curia <maxy at debian.org>,
  Diane Trout <diane at debian.org>
 Build-Depends: debhelper (>= 9),
                doxygen,
+               libjs-jquery,
                pkg-config,
                libglib2.0-dev,
                libqt4-dev,
diff --git a/debian/rules b/debian/rules
index 4b14b39..a3228fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,8 @@ override_dh_auto_install:
 	dh_auto_install -Bbuild/qt4
 
 override_dh_install:
+	rm -f debian/tmp/usr/share/doc/accounts-qt/html/jquery.js
+	ln -s usr/share/javascript/jquery.js debian/tmp/usr/share/doc/accounts-qt/html/jquery.js
 	rm -f debian/tmp/usr/share/libaccounts-qt-tests/*
 	rm -f debian/tmp/usr/bin/*
 	dh_install --fail-missing

-- 
libaccounts-qt packaging



More information about the pkg-kde-commits mailing list