This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit f5707db645192163bbc723031d858d304b41b4dc
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Feb 3 11:27:35 2018 +0100
Don't use libjs-jquery for Doxygen docs.
---
debian/changelog | 6 ++++++
debian/control | 3 +--
debian/qgis-api-doc.links | 1 -
debian/rules | 2 --
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 50f10be..331c0fc 100644
--- 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 <sebas...@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.
diff --git a/debian/control b/debian/control
index 30338d5..2ec5362 100644
--- 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
diff --git a/debian/qgis-api-doc.links b/debian/qgis-api-doc.links
deleted file mode 100644
index 42d4aa1..0000000
--- 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
diff --git a/debian/rules b/debian/rules
index 5acecc4..eeae37a 100755
--- 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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
