This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master-svn in repository grass.
commit 6cd5ba309f95a4b5a47b632bfb08e80d0d6a19f8 Author: Bas Couwenberg <[email protected]> Date: Sat Apr 9 16:56:06 2016 +0200 Use packaged jQuery in HTML documentation. --- debian/changelog | 1 + debian/grass-doc.links | 1 + debian/grass-doc.links.in | 1 + debian/patches/jquery.patch | 15 +++++++++++++++ debian/patches/series | 1 + 5 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 86f13a1..ef3761a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ grass (7.1.svn20160409-1) UNRELEASED; urgency=medium - Add Tereza Fiedlerova & pietro to copyright holders - Add license & copyright for lz4.{c,h} * Add patch to fix various spelling errors. + * Use packaged jQuery in HTML documentation. -- Bas Couwenberg <[email protected]> Sat, 09 Apr 2016 12:50:12 +0200 diff --git a/debian/grass-doc.links b/debian/grass-doc.links index 62e0179..7ed9789 100644 --- a/debian/grass-doc.links +++ b/debian/grass-doc.links @@ -1 +1,2 @@ usr/share/doc/grass-doc/html usr/lib/grass71/docs/html +usr/share/javascript/jquery usr/share/doc/grass-doc/html/jquery diff --git a/debian/grass-doc.links.in b/debian/grass-doc.links.in index 014dee0..9717840 100644 --- a/debian/grass-doc.links.in +++ b/debian/grass-doc.links.in @@ -1 +1,2 @@ usr/share/doc/grass-doc/html usr/lib/grass@VERSION@/docs/html +usr/share/javascript/jquery usr/share/doc/grass-doc/html/jquery diff --git a/debian/patches/jquery.patch b/debian/patches/jquery.patch new file mode 100644 index 0000000..87802a7 --- /dev/null +++ b/debian/patches/jquery.patch @@ -0,0 +1,15 @@ +Description: Use packaged jQuery. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/man/build_html.py ++++ b/man/build_html.py +@@ -326,7 +326,7 @@ headerpso_tmpl = \ + r""" + <link rel="stylesheet" href="grassdocs.css" type="text/css"> + <link rel="stylesheet" href="parser_standard_options.css" type="text/css"> +-<script src="http://code.jquery.com/jquery-1.11.3.min.js";></script> ++<script src="jquery/jquery.min.js"></script> + <script type="text/javascript" src="jquery.fixedheadertable.min.js"></script> + <script type="text/javascript" src="parser_standard_options.js"></script> + </head> diff --git a/debian/patches/series b/debian/patches/series index 70fc821..6352294 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ instdir no-fail-html.patch appstream.patch spelling-errors.patch +jquery.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
