[Git][debian-gis-team/pyosmium][master] 3 commits: Bump debhelper compat to 12.

[Bas Couwenberg (@sebastic)]

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


Commits:
4c921f22 by Bas Couwenberg at 2021-09-13T19:36:52+02:00
Bump debhelper compat to 12.

Changes:
- Drop --list-missing from dh_install

- - - - -
1b6454f9 by Bas Couwenberg at 2021-09-13T19:44:39+02:00
Update doc-base paths.

- - - - -
f0a0da5d by Bas Couwenberg at 2021-09-13T19:54:04+02:00
Use sphinxdoc helper.

- - - - -


7 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/pyosmium-doc.doc-base
- − debian/pyosmium-doc.links
- − debian/pyosmium-doc.lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,10 @@
 pyosmium (3.2.0-2) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 4.6.0, no changes.
+  * Bump debhelper compat to 12, changes:
+    - Drop --list-missing from dh_install
+  * Update doc-base paths.
+  * Use sphinxdoc helper.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Sep 2021 17:40:10 +0200
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Bas Couwenberg <sebastic at debian.org>
 Section: science
 Priority: optional
 Build-Depends: cmake (>= 2.8.12),
-               debhelper (>= 10~),
+               debhelper-compat (= 12),
                dh-python,
                libboost-dev,
                libbz2-dev,
@@ -65,9 +65,7 @@ Description: Osmium library bindings for Python 3
 Package: pyosmium-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery,
-         libjs-sphinxdoc,
-         libjs-underscore,
+Depends: ${sphinxdoc:Depends},
          ${misc:Depends}
 Description: Osmium library bindings for Python - Documentation
  The PyOsmium module allows you to access some of the features of the Osmium


=====================================
debian/pyosmium-doc.doc-base
=====================================
@@ -6,5 +6,5 @@ Abstract: This manual describes what PyOsmium is
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/pyosmium-doc/html/index.html
-Files: /usr/share/doc/pyosmium-doc/html/*
+Index: /usr/share/doc/pyosmium/html/index.html
+Files: /usr/share/doc/pyosmium/html/*


=====================================
debian/pyosmium-doc.links deleted
=====================================
@@ -1,4 +0,0 @@
-usr/share/javascript/jquery/jquery.js             usr/share/doc/pyosmium-doc/html/_static/jquery.js
-usr/share/javascript/sphinxdoc/1.0/doctools.js    usr/share/doc/pyosmium-doc/html/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/pyosmium-doc/html/_static/searchtools.js
-usr/share/javascript/underscore/underscore.js     usr/share/doc/pyosmium-doc/html/_static/underscore.js


=====================================
debian/pyosmium-doc.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# sphinx does not provide language_data.js
-embedded-javascript-library */language_data.js please use sphinx
-


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ export VERBOSE=1
 %:
 	dh $@ \
 	    --buildsystem pybuild \
-	    --with python3
+	    --with python3,sphinxdoc
 
 override_dh_clean:
 	dh_clean
@@ -34,16 +34,3 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	PYBUILD_INSTALL_ARGS="--install-scripts=/usr/lib/{package}" dh_auto_install
-
-override_dh_install:
-	dh_install --list-missing
-
-	# Remove embedded jquery.js in favor of libjs-jquery
-	$(RM) debian/*/usr/share/doc/*/html/_static/jquery.js
-
-	# Remove embedded doctools.js & searchtools.js in favor of libjs-sphinxdoc
-	$(RM) debian/*/usr/share/doc/*/html/_static/doctools.js
-	$(RM) debian/*/usr/share/doc/*/html/_static/searchtools.js
-
-	# Remove embedded underscore.js in favor of libjs-underscore
-	$(RM) debian/*/usr/share/doc/*/html/_static/underscore.js



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/7a68e1d421e0a3fe0f8ae42f6b5d5e666643338e...f0a0da5d3728642b8332a00c76b0445609b12edb

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/7a68e1d421e0a3fe0f8ae42f6b5d5e666643338e...f0a0da5d3728642b8332a00c76b0445609b12edb
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/20210913/31fce4d8/attachment-0001.htm>