[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+dfsg-3-3-g6cf52aa

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=6cf52aa

The following commit has been merged in the master branch:
commit 6cf52aa00bbc7e37e28bb4531d6172e642c6fb69
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Aug 27 23:26:42 2013 -0300

    Fix broken symlink.
---
 debian/changelog          |    1 +
 debian/qt4-doc-html.links |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 064ed1a..0bc2aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qt4-x11 (4:4.8.5+dfsg-4) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix typo in libqt4-opengl-dev dependencies (Closes: #720302).
+  * Fix broken symlink to use the system's jquery javascript library.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Aug 2013 13:29:53 -0300
 
diff --git a/debian/qt4-doc-html.links b/debian/qt4-doc-html.links
index d7e6563..cd84209 100644
--- a/debian/qt4-doc-html.links
+++ b/debian/qt4-doc-html.links
@@ -1,2 +1,2 @@
 usr/share/qt4/doc/html usr/share/doc/qt4-doc-html/html
-usr/share/javascript/jquery/jquery.js usr/share/javascript/jquery/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/qt4/doc/html/scripts/jquery.js

-- 
Qt 4 packaging