[geos] 03/03: Use jquery.js from libjs-jquery instead of doxygen copy.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository geos.

commit 9bde083014030f84e035cdd8c1226b161957f7a0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 1 13:34:45 2015 +0200

    Use jquery.js from libjs-jquery instead of doxygen copy.
---
 debian/changelog         | 1 +
 debian/control           | 3 ++-
 debian/libgeos-doc.links | 1 +
 debian/rules             | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8279de3..951dea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ geos (3.4.2-7) unstable; urgency=medium
 
   * Update symbols for other architectures.
   * Move from experimental to unstable.
+  * Use jquery.js from libjs-jquery instead of doxygen copy.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Apr 2015 10:14:34 +0200
 
diff --git a/debian/control b/debian/control
index 6ffc947..51dc2ea 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,8 @@ Description: Geometry engine for Geographic Information Systems - C++ Library
 Package: libgeos-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery,
+         ${misc:Depends}
 Suggests: libgeos-dev (= ${binary:Version})
 Description: Documentation for the GEOS GIS geometry engine library
  GEOS provides a spatial object model and fundamental geometric
diff --git a/debian/libgeos-doc.links b/debian/libgeos-doc.links
index 9498789..cda3fb3 100644
--- a/debian/libgeos-doc.links
+++ b/debian/libgeos-doc.links
@@ -1 +1,2 @@
 usr/share/doc/libgeos-doc/html/index.html usr/share/doc/libgeos-doc/index.html
+usr/share/javascript/jquery/jquery.js     usr/share/doc/libgeos-doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 4f417c1..672f14d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,6 +102,9 @@ override_dh_install-indep:
 	install -m 644 doc/example.cpp debian/libgeos-doc/usr/share/doc/libgeos-doc/examples
 	install -m 644 debian/Makefile.example debian/libgeos-doc/usr/share/doc/libgeos-doc/examples/Makefile
 
+	# Remove embedded jquery.js in favor of libjs-query
+	rm -f debian/libgeos-doc/usr/share/doc/libgeos-doc/html/jquery.js
+
 override_dh_installman:
 	dh_installman -plibgeos-dev debian/geos-config.1
 

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