[DHG_packages] 01/01: Fix links to jquery.

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script.

gio pushed a commit to branch master
in repository DHG_packages.

commit 187d4e9fac6d3bbcf6e88ec7bce4fe9efc9f2ab0
Author: Giovanni Mascellani <gio at debian.org>
Date:   Mon May 2 10:27:29 2016 +0200

    Fix links to jquery.
---
 p/gitit/debian/changelog            |  6 ++++++
 p/gitit/debian/control              |  7 +++++++
 p/gitit/debian/patches/jquery.patch | 24 ++++++++++++++++++++++++
 p/gitit/debian/patches/series       |  1 +
 p/gitit/debian/rules                |  1 +
 5 files changed, 39 insertions(+)

diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index 776fd53..b633e0a 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -1,3 +1,9 @@
+gitit (0.12.1-2) UNRELEASED; urgency=medium
+
+  * Fix links to jquery (closes: #820469).
+
+ -- Giovanni Mascellani <gio at debian.org>  Mon, 02 May 2016 10:20:16 +0200
+
 gitit (0.12.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index d5f088f..a5e22eb 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -6,9 +6,13 @@ Section: haskell
 Build-Depends: debhelper (>= 9),
  haskell-devscripts (>= 0.10.2.3),
  cdbs,
+ dh-linktree,
  xsltproc,
  pandoc,
  docbook-xsl,
+ libjs-jquery,
+ libjs-jquery-ui,
+ libjs-jquery-hotkeys,
  ghc,
  ghc-prof,
  libghc-configfile-dev (>= 1),
@@ -246,6 +250,9 @@ Package: libghc-gitit-data
 Architecture: all
 Depends: ${misc:Depends},
  ${haskell:Extra-Depends},
+ libjs-jquery,
+ libjs-jquery-ui,
+ libjs-jquery-hotkeys,
 Recommends: ${haskell:Recommends},
 Suggests: ${haskell:Suggests},
 Breaks: gitit (<< 0.10.6.3+dfsg-1),
diff --git a/p/gitit/debian/patches/jquery.patch b/p/gitit/debian/patches/jquery.patch
new file mode 100644
index 0000000..85c29b9
--- /dev/null
+++ b/p/gitit/debian/patches/jquery.patch
@@ -0,0 +1,24 @@
+Index: gitit/data/templates/expire.st
+===================================================================
+--- gitit.orig/data/templates/expire.st
++++ gitit/data/templates/expire.st
+@@ -1,5 +1,5 @@
+ $if(usecache)$
+-<script type="text/javascript" src="$base$/js/jquery.hotkeys-0.7.9.min.js"></script>
++<script type="text/javascript" src="$base$/js/jquery.hotkeys.js"></script>
+ <script type="text/javascript">
+ /* <![CDATA[ */
+      \$(document).bind("keydown", "ctrl+r", function() {
+Index: gitit/src/Network/Gitit/Layout.hs
+===================================================================
+--- gitit.orig/src/Network/Gitit/Layout.hs
++++ gitit/src/Network/Gitit/Layout.hs
+@@ -78,7 +78,7 @@ filledPageTemplate base' cfg layout html
+                            'h':'t':'t':'p':_  -> x
+                            _                  -> base' ++ "/js/" ++ x
+ 
+-      scripts  = ["jquery-1.2.6.min.js", "jquery-ui-combined-1.6rc2.min.js", "footnotes.js"] ++ pgScripts layout
++      scripts  = ["jquery.js", "jquery.ui.core.js", "jquery.ui.draggable.js", "jquery.ui.droppable.js", "jquery.ui.tabs.js", "footnotes.js"] ++ pgScripts layout
+       scriptLink x = script ! [src (prefixedScript x),
+         thetype "text/javascript"] << noHtml
+       javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
diff --git a/p/gitit/debian/patches/series b/p/gitit/debian/patches/series
index d2ec8f3..cbc1544 100644
--- a/p/gitit/debian/patches/series
+++ b/p/gitit/debian/patches/series
@@ -1 +1,2 @@
 clean-cabal-file.patch
+jquery.patch
diff --git a/p/gitit/debian/rules b/p/gitit/debian/rules
index cdb30f7..9ad3c81 100755
--- a/p/gitit/debian/rules
+++ b/p/gitit/debian/rules
@@ -24,3 +24,4 @@ install/libghc-gitit-data::
 
 binary-post-install/libghc-gitit-data::
 	chmod +x debian/libghc-gitit-data/usr/share/gitit/data/post-update
+	dh_linktree -plibghc-gitit-data

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git