[Git][debian-gis-team/gdal][master] 9 commits: Merge branches 'experimental' and 'master' of ssh://git.debian.org/git/pkg-grass/gdal

[Sebastiaan Couwenberg]

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


Commits:
7ff560aa by Francesco Paolo Lovergine at 2015-10-21T13:48:14+02:00
Merge branches 'experimental' and 'master' of ssh://git.debian.org/git/pkg-grass/gdal

Conflicts:
	debian/changelog
	debian/patches/series

- - - - -
4c34fa7c by Francesco Paolo Lovergine at 2015-10-21T13:54:32+02:00
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal

Conflicts:
	debian/changelog
	debian/patches/series

- - - - -
1fc18f62 by Francesco Paolo Lovergine at 2017-07-20T13:44:14+02:00
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal

- - - - -
95928b4b by Francesco Paolo Lovergine at 2017-11-06T16:13:12+01:00
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal

- - - - -
2e9ab5b8 by Francesco Paolo Lovergine at 2018-01-02T12:14:08+01:00
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal

- - - - -
8892a334 by Francesco Paolo Lovergine at 2018-01-02T12:31:23+01:00
Fixed for correct Perl binding documentation generation.

- - - - -
4cd7378f by Francesco Paolo Lovergine at 2018-01-02T13:34:55+01:00
Now doxygen jquery left in place for compatibility

- - - - -
a2cfbda5 by Bas Couwenberg at 2018-01-02T13:59:40+01:00
Strip trailing whitespace form changelog and patch header.

- - - - -
da9b6b79 by Bas Couwenberg at 2018-01-02T14:00:54+01:00
Reorder build dependencies (sorted by name).

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/perl-doxyfile
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+gdal (2.2.3+dfsg-2) unstable; urgency=medium
+
+  [ Francesco Paolo Lovergine ]
+  [UNRELEASED]
+
+  * Added a couple of missing build-dep to correctly generate Perl binding
+    documentation.
+  * New patch perl-doxygen added to get the full classes documentation in
+    Perl binding, due to current doxygen implementation.
+  * The doxygen jquery is currently a fork of jquery in minified form, and it
+    is not compatible with the modern one. Replacement with the libjsquery
+    provided now removed.
+
+  [ Bas Couwenberg ]
+  * Strip trailing whitespace form changelog and patch header.
+  * Reorder build dependencies (sorted by name).
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 02 Jan 2018 12:27:12 +0100
+
 gdal (2.2.3+dfsg-1) unstable; urgency=medium
 
   * Update symbols for alpha, hurd-i386 & m68k.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
                libarmadillo-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libdap-dev,
+               libdoxygen-filter-perl,
                libepsilon-dev (>= 0.9.1-1~),
                libexpat1-dev,
                libfreexl-dev (>= 1.0.0),
@@ -30,6 +31,7 @@ Build-Depends: debhelper (>= 9),
                libjson-c-dev,
                libkml-dev (>= 1.3.0~rc0-3),
                liblzma-dev,
+               libmodern-perl-perl,
        default-libmysqlclient-dev,
                libnetcdf-dev (>= 1:4.0.0),
                libogdi3.2-dev,


=====================================
debian/patches/perl-doxyfile
=====================================
--- /dev/null
+++ b/debian/patches/perl-doxyfile
@@ -0,0 +1,16 @@
+Description: Fix generation of classes documentation in Perl bindings doxygen stuff.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2018-01-02
+Forwarded: needed
+
+--- gdal.orig/swig/perl/Doxyfile
++++ gdal/swig/perl/Doxyfile
+@@ -280,7 +280,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
+ # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+ # the files are not read by doxygen.
+ 
+-EXTENSION_MAPPING      =
++EXTENSION_MAPPING      = pm=C++
+ 
+ # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+ # according to the Markdown format, which allows for more readable


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ java.opt
 perl-vendor
 privacy-breach-logo.patch
 privacy-breach-generic.patch
+perl-doxyfile


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -188,10 +188,6 @@ 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
-	rm -f $(CURDIR)/debian/*/usr/share/doc/libgdal-perl/*/jquery.js
-
 	# removing embedded rpath in main lib
 	-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath --delete {} \;
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/087bd840c3f98214fd4c85313c151eea826ac635...da9b6b7986a2a21f8563c8342d919425a704e904

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/compare/087bd840c3f98214fd4c85313c151eea826ac635...da9b6b7986a2a21f8563c8342d919425a704e904
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/20180102/8bcc4ddd/attachment-0001.html>