[Git][debian-gis-team/qgis][master] Don't use libjs-jquery for Doxygen docs.

[Sebastiaan Couwenberg]

Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / qgis


Commits:
f5707db6 by Bas Couwenberg at 2018-02-03T11:27:35+01:00
Don't use libjs-jquery for Doxygen docs.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- − debian/qgis-api-doc.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.22+dfsg-3) UNRELEASED; urgency=medium
+
+  * Don't use libjs-jquery for Doxygen docs.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 03 Feb 2018 11:27:27 +0100
+
 qgis (2.14.22+dfsg-2) unstable; urgency=medium
 
   * Update packaging for GRASS 7.4.0.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -415,8 +415,7 @@ Description: QGIS server providing various OGC services
 Package: qgis-api-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery,
-         ${misc:Depends}
+Depends: ${misc:Depends}
 Recommends: qt4-doc-html
 Description: QGIS API documentation
  QGIS is a Geographic Information System (GIS) which manages, analyzes and


=====================================
debian/qgis-api-doc.links deleted
=====================================
--- a/debian/qgis-api-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/html/jquery.js


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -231,8 +231,6 @@ install-arch-stamp:
 
 	# remove unwanted files
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
-	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
 
 	# Don't include a copy of the world.tif also included in osgearth-data
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/f5707db645192163bbc723031d858d304b41b4dc

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/f5707db645192163bbc723031d858d304b41b4dc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180203/1d77b7ad/attachment-0001.html>