Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / geographiclib
Commits: 3a05598a by Francesco Paolo Lovergine at 2018-01-18T11:53:54+01:00 Preserving Doxygen jquery - - - - - 623c7295 by Francesco Paolo Lovergine at 2018-01-18T12:05:15+01:00 Removed local .gitignore - - - - - 720d7ce7 by Francesco Paolo Lovergine at 2018-01-18T12:14:11+01:00 Removed jqeury soft linking - - - - - 34d62de1 by Francesco Paolo Lovergine at 2018-01-18T12:35:52+01:00 Added patch to generate a tree view in html documentation - - - - - 034a4283 by Francesco Paolo Lovergine at 2018-01-19T09:37:12+01:00 Fixed mathjax path - - - - - 69a66d0f by Francesco Paolo Lovergine at 2018-01-19T09:41:01+01:00 Finalize doxygen.patch - - - - - 4c41f844 by Francesco Paolo Lovergine at 2018-01-19T09:42:29+01:00 Annotated changelog for doxygen.patch - - - - - b5ad4bdb by Bas Couwenberg at 2018-01-19T12:11:11+01:00 Bump Standards-Version to 4.1.3, no changes. - - - - - 8 changed files: - − .gitignore - debian/changelog - debian/control - debian/geographiclib-doc.links - + debian/patches/doxygen.patch - debian/patches/privacy.patch - debian/patches/series - debian/rules Changes: ===================================== .gitignore deleted ===================================== --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignore .pc quilt patches stuff -.pc ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +geographiclib (1.49-3) UNRELEASED; urgency=medium + + [ Francesco Paolo Lovergine ] + * Doxygen JQuery is not compatible with the standard one, so the embedded + version is now preserved. + * Now using treeview in doxygen doc for a better readability. + * Fixed Mathjax path for doxygen use. + + [ Bas Couwenberg ] + * Bump Standards-Version to 4.1.3, no changes. + + -- Francesco Paolo Lovergine <[email protected]> Thu, 18 Jan 2018 11:49:31 +0100 + geographiclib (1.49-2) unstable; urgency=medium * Add patch by Chris Lamb to make the build reproducible. ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: autoconf-archive, python3-all, python3-setuptools, pkg-kde-tools -Standards-Version: 4.1.2 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/geographiclib.git Vcs-Git: https://anonscm.debian.org/git/pkg-grass/geographiclib.git Homepage: https://geographiclib.sourceforge.io/ @@ -40,8 +40,7 @@ Description: C++ library to solve some geodesic problems -- tools Package: geographiclib-doc Architecture: all Section: doc -Depends: libjs-jquery, - libjs-mathjax, +Depends: libjs-mathjax, ${misc:Depends} Breaks: geographiclib-tools (<< 1.40-1~exp1) Replaces: geographiclib-tools (<< 1.40-1~exp1) ===================================== debian/geographiclib-doc.links ===================================== --- a/debian/geographiclib-doc.links +++ b/debian/geographiclib-doc.links @@ -1,8 +1,3 @@ -# Link packaged jquery.js -usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/jquery.js -usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/C/jquery.js -usr/share/javascript/jquery/jquery.js usr/share/doc/geographiclib/html/Fortran/jquery.js - # Link duplicate document files removed in d/rules usr/share/doc/geographiclib/html/bc_s.png usr/share/doc/geographiclib/html/C/bc_s.png usr/share/doc/geographiclib/html/bc_s.png usr/share/doc/geographiclib/html/Fortran/bc_s.png ===================================== debian/patches/doxygen.patch ===================================== --- /dev/null +++ b/debian/patches/doxygen.patch @@ -0,0 +1,15 @@ +Description: Adding treeview for better readability of doxygen doc +Author: Francesco Paolo Lovergine <[email protected]> +Forwarded: not-needed + +--- geographiclib.orig/doc/doxyfile.in ++++ geographiclib/doc/doxyfile.in +@@ -1135,7 +1135,7 @@ + # Since the tree basically has the same information as the tab index you + # could consider to set DISABLE_INDEX to NO when enabling this option. + +-GENERATE_TREEVIEW = NO ++GENERATE_TREEVIEW = YES + + # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values + # (range [0,1..20]) that doxygen will group on one line in the generated HTML ===================================== debian/patches/privacy.patch ===================================== --- a/debian/patches/privacy.patch +++ b/debian/patches/privacy.patch @@ -10,18 +10,18 @@ Description: Fix privacy breaches detected by lintian Author: Ross Gammon <[email protected]> Forwarded: not-needed ---- a/doc/doxyfile.in -+++ b/doc/doxyfile.in -@@ -1190,7 +1190,7 @@ USE_MATHJAX = YES +--- geographiclib.orig/doc/doxyfile.in ++++ geographiclib/doc/doxyfile.in +@@ -1190,7 +1190,7 @@ # However, it is strongly recommended to install a local # copy of MathJax from http://www.mathjax.org before deployment. -MATHJAX_RELPATH = https://geographiclib.sourceforge.io/MathJax-2.7.2 -+MATHJAX_RELPATH = /usr/share/javascript/mathjax/MathJax.js ++MATHJAX_RELPATH = /usr/share/javascript/mathjax # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension # names that should be enabled during MathJax rendering. -@@ -1205,7 +1205,7 @@ MATHJAX_EXTENSIONS = +@@ -1205,7 +1205,7 @@ # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. @@ -30,9 +30,9 @@ Forwarded: not-needed # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client ---- a/doc/doxyfile-c.in -+++ b/doc/doxyfile-c.in -@@ -1201,7 +1201,7 @@ MATHJAX_EXTENSIONS = +--- geographiclib.orig/doc/doxyfile-c.in ++++ geographiclib/doc/doxyfile-c.in +@@ -1201,7 +1201,7 @@ # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. @@ -41,9 +41,9 @@ Forwarded: not-needed # When the SERVER_BASED_SEARCH tag is enabled the search engine will be # implemented using a PHP enabled web server instead of at the web client ---- a/doc/doxyfile-for.in -+++ b/doc/doxyfile-for.in -@@ -1200,7 +1200,7 @@ MATHJAX_EXTENSIONS = +--- geographiclib.orig/doc/doxyfile-for.in ++++ geographiclib/doc/doxyfile-for.in +@@ -1200,7 +1200,7 @@ # typically be disabled. For large projects the javascript based search engine # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ css.patch privacy.patch disable-python-build.patch reproducible-build.patch +doxygen.patch ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -48,10 +48,6 @@ override_dh_install: # Remove MATLAB files $(RM) -r debian/tmp/usr/share/matlab/ - # Remove embedded jQuery - $(RM) debian/tmp/usr/share/doc/geographiclib/html/*/jquery.js \ - debian/tmp/usr/share/doc/geographiclib/html/jquery.js - # Move Node.js module to /usr/lib/nodejs mkdir -p debian/tmp/usr/lib/nodejs $(RM) debian/tmp/usr/lib/*/node_modules/geographiclib/README.md View it on GitLab: https://salsa.debian.org/debian-gis-team/geographiclib/compare/b7825af7dd3569ca5d1062cd84530f25d5506f17...b5ad4bdbd9702ca13c43a6bc77aec166e807062c --- View it on GitLab: https://salsa.debian.org/debian-gis-team/geographiclib/compare/b7825af7dd3569ca5d1062cd84530f25d5506f17...b5ad4bdbd9702ca13c43a6bc77aec166e807062c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
