[Pkg-telepathy-commits] [SCM] telepathy-qt4 packaging branch, debian, updated. debian/0.7.1-1-23-g53f592b

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 4e685d87567ee27cfad63279b35c3ba37e25c09c
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Jun 4 13:47:39 2012 +0200

    Link jquery.js file to the one provided by libjs-jquery

diff --git a/debian/changelog b/debian/changelog
index c6e82ba..b9cf1fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ telepathy-qt (0.9.1-1) UNRELEASED; urgency=low
   * debian/control: Bump Standards-Version to 3.9.3 (no further changes)
   * Bump debhelper compatibility to 9
   * debian/watch: Update watch file to match new upstream name
+  * Link jquery.js file to the one provided by libjs-jquery
 
   [ George Kiagiadakis ]
   * Change the gcc-4.7 ftbfs patch to use the upstream patch.
@@ -21,7 +22,7 @@ telepathy-qt (0.9.1-1) UNRELEASED; urgency=low
   * Update README.source.
   * Update debian/copyright.
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 31 May 2012 14:47:51 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 04 Jun 2012 13:45:55 +0200
 
 telepathy-qt4 (0.7.1-1.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 886c013..24012af 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,7 @@ Description: Qt 4 Telepathy library (debug symbols)
 Package: libtelepathy-qt4-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery, ${misc:Depends}
 Description: Qt 4 Telepathy library (documentation)
  This package contains HTML documentation for telepathy-qt4, a Qt-based
  library for Telepathy components.
diff --git a/debian/rules b/debian/rules
index e961481..1dc1b60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,3 +28,5 @@ override_dh_install:
 override_dh_installdocs:
 	dh_installdocs -a --link-doc=libtelepathy-qt4-2
 	dh_installdocs -i
+	rm -f debian/libtelepathy-qt4-doc/usr/share/doc/libtelepathy-qt4-doc/html/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.min.js debian/libtelepathy-qt4-doc/usr/share/doc/libtelepathy-qt4-doc/html/jquery.js

-- 
telepathy-qt4 packaging