[Git][debian-gis-team/pycsw][master] 3 commits: Add upstream patch to fix FTBFS with sphinx 2.4.

Wed May 6 05:36:50 BST 2020


Bas Couwenberg pushed to branch master at Debian GIS Project / pycsw


Commits:
826d0125 by Bas Couwenberg at 2020-05-06T06:15:17+02:00
Add upstream patch to fix FTBFS with sphinx 2.4.

- - - - -
25f3a964 by Bas Couwenberg at 2020-05-06T06:16:09+02:00
Reinstate pycsw-doc package.

Revert "Drop pycsw-doc package, FTBFS with sphinx 2.4. (closes: #959775)"

This reverts commit de17ff695851e9422195f7916f75a9d99de1957c.

- - - - -
af8e135d by Bas Couwenberg at 2020-05-06T06:16:38+02:00
Set distribution to unstable.

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/man/pycsw-admin.md
- + debian/patches/0001-fix-Sphinx-docs-config-609-611.patch
- debian/patches/series
- + debian/pycsw-doc.doc-base
- + debian/pycsw-doc.docs
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+pycsw (2.4.2+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * Add upstream patch to fix FTBFS with sphinx 2.4.
+  * Reinstate pycsw-doc package.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 May 2020 06:16:30 +0200
+
 pycsw (2.4.2+dfsg-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -23,6 +23,7 @@ Build-Depends: apache2-dev,
                python3-setuptools,
                python3-shapely,
                python3-six,
+               python3-sphinx,
                python3-sqlalchemy,
                python3-tz,
                python3-xmltodict,
@@ -39,6 +40,7 @@ Depends: pycsw-wsgi (= ${binary:Version}),
          python3-pycsw (= ${binary:Version}),
          ${python3:Depends},
          ${misc:Depends}
+Suggests: pycsw-doc
 Description: OGC compliant metadata (Catalogue Service for the Web) server
  pycsw is an OGC CSW server implementation written in Python. pycsw fully
  implements the OpenGIS Catalogue Service Implementation Specification
@@ -105,3 +107,23 @@ Description: WSGI Apache CSW service based on pycsw
  and runs on all major platforms (Windows, Linux, Mac OS X).
  .
  This package contains the Apache mod_wsgi scripts and tests.
+
+Package: pycsw-doc
+Architecture: all
+Section: non-free/doc
+Depends: ${sphinxdoc:Depends},
+         ${misc:Depends}
+Description: OGC compliant metadata (Catalogue Service for the Web) server - documentation
+ pycsw is an OGC CSW server implementation written in Python. pycsw fully
+ implements the OpenGIS Catalogue Service Implementation Specification
+ (Catalogue Service for the Web). Initial development started in 2010
+ (more formally announced in 2011). The project is certified OGC Compliant,
+ and is an OGC Reference Implementation. Since 2015, pycsw is an official
+ OSGeo Project. pycsw allows for the publishing and discovery of geospatial
+ metadata via numerous APIs (CSW 2/CSW 3, OpenSearch, OAI-PMH, SRU).
+ Existing repositories of geospatial metadata can also be exposed,
+ providing a standards-based metadata and catalogue component of spatial
+ data infrastructures. pycsw is Open Source, released under an MIT license,
+ and runs on all major platforms (Windows, Linux, Mac OS X).
+ .
+ This package contains the pycsw documentation.


=====================================
debian/man/pycsw-admin.md
=====================================
@@ -99,3 +99,7 @@ pycsw-admin(1) - pycsw admin utility
 12.) delete_records: Deletes all records from repository without prompting
 
         pycsw-admin -c delete_records -f default.cfg -y
+
+##MORE INFORMATION
+
+More information about pycsw can be obtained from _/usr/share/doc/pycsw-doc_ after installing the *pycsw-doc* package.


=====================================
debian/patches/0001-fix-Sphinx-docs-config-609-611.patch
=====================================
@@ -0,0 +1,17 @@
+Description: fix Sphinx docs config (#609) (#611)
+Author: Tom Kralidis <tomkralidis at gmail.com>
+Origin: https://github.com/geopython/pycsw/commit/e81ff12976cbd76bcdc59c5a2d8d82fc5cac55f7
+Bug: https://github.com/geopython/pycsw/issues/609
+Bug-Debian: https://bugs.debian.org/
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -179,7 +179,7 @@ html_last_updated_fmt = '%Y-%m-%dT%H:%M:
+ # Custom sidebar templates, maps document names to template names.
+ html_sidebars = {
+     #'index':'indexsidebar.html',
+-    '**':'indexsidebar.html',
++    '**': ['indexsidebar.html']
+ }
+ 
+ # Additional templates that should be rendered to pages, maps page names to


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
 0006-Don-t-include-external-references-to-images.patch
 version-requirements.patch
 python3.8-SyntaxWarning.patch
+0001-fix-Sphinx-docs-config-609-611.patch


=====================================
debian/pycsw-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: pycsw-docbase
+Title: pycsw Documentation
+Author: Tom Kralidis
+Abstract: This is the pycsw manual
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/pycsw-doc/index.html
+Files: /usr/share/doc/pycsw-doc/*.html


=====================================
debian/pycsw-doc.docs
=====================================
@@ -0,0 +1 @@
+build/html/*


=====================================
debian/rules
=====================================
@@ -8,13 +8,14 @@ include /usr/share/dpkg/pkg-info.mk
 BUILD_DATE := $(shell LC_ALL=C date -u "+%Y-%m-%d" -d "@$(SOURCE_DATE_EPOCH)")
 
 %:
-	dh  $@ --with python3,apache2 --buildsystem pybuild
+	dh  $@ --with python3,sphinxdoc,apache2 --buildsystem pybuild
 
 override_dh_clean:
 	dh_clean debian/man/pycsw-admin.1
 
 override_dh_auto_build:
 	dh_auto_build
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html # HTML generator
 	ronn -r --date="$(BUILD_DATE)" --manual=pycsw debian/man/*.md
 	rm -f debian/man/*.html
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/-/compare/7e58de544df3c0d367bc319ecc87fbe5166b7047...af8e135da792ff22cc579c4db12b3a8361cce5d6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/-/compare/7e58de544df3c0d367bc319ecc87fbe5166b7047...af8e135da792ff22cc579c4db12b3a8361cce5d6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200506/361bc76b/attachment-0001.html>
