[gdal] 02/03: Use packaged jquery.js instead of Doxygen copy.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gdal.

commit ac76a8e3cd056ec5a19fd3ff7fb257120ba96fb7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 23 16:13:56 2015 +0200

    Use packaged jquery.js instead of Doxygen copy.
---
 debian/changelog         | 6 ++++++
 debian/control           | 3 ++-
 debian/libgdal-doc.links | 2 ++
 debian/rules             | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 316927d..cc7e89d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.11.2+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+  * Use packaged jquery.js instead of Doxygen copy.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 23 May 2015 16:05:43 +0200
+
 gdal (1.11.2+dfsg-1~exp2) experimental; urgency=medium
 
   * Update symbols for amd64, arm64, armel, armhf, hurd-i386, i386,
diff --git a/debian/control b/debian/control
index bf60740..06a3cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +164,8 @@ Description: Geospatial Data Abstraction Library - Development files
 Package: libgdal-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: libjs-jquery,
+         ${misc:Depends}
 Suggests: libgdal1h
 Description: Documentation for the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
diff --git a/debian/libgdal-doc.links b/debian/libgdal-doc.links
new file mode 100644
index 0000000..56612f8
--- /dev/null
+++ b/debian/libgdal-doc.links
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/gdal/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/libgdal-doc/ogr/jquery.js
diff --git a/debian/rules b/debian/rules
index f7e40d4..96d1720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,7 +175,10 @@ override_dh_auto_install:
 
 	# removing la file
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libgdal.la
-	
+
+	# Remove doxygen jquery.js copy in favor of libjs-jquery
+	rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-doc/*/jquery.js
+
 	# removing embedded rpath in main lib
 	-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath --delete {} \;
 

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