[Git][debian-gis-team/mercantile][master] 8 commits: compat level 10 needs debhelper (>=10) as dependency

[Joachim Langenbach]

Joachim Langenbach pushed to branch master at Debian GIS Project / mercantile


Commits:
c82e3354 by Joachim Langenbach at 2020-05-03T16:29:50+00:00
compat level 10 needs debhelper (>=10) as dependency

- - - - -
021ccf4e by Joachim Langenbach at 2020-05-03T19:38:12+02:00
Removed docs/* entry, because it's the same copyright holder, than the one for *

- - - - -
a1f13342 by Joachim Langenbach at 2020-05-03T19:38:45+02:00
* Added empty line before patch body
 * refreshed the patch

- - - - -
3891ed87 by Joachim Langenbach at 2020-05-03T19:38:59+02:00
Made tag regex more robust

- - - - -
b4ebde50 by Joachim Langenbach at 2020-05-03T19:39:32+02:00
Cleaning the docs without changing the directory

- - - - -
0b88461e by Joachim Langenbach at 2020-05-03T19:40:21+02:00
Removed cleaning up .pycache and .egg-info, as it is not be needed

- - - - -
bd2a3292 by Joachim Langenbach at 2020-05-03T19:43:51+02:00
* Fixed missing debian/compat for level 10
 * Added ~ to debhelper version, as stated in debhelper manpage

- - - - -
7aa87d04 by Joachim Langenbach at 2020-05-03T17:52:21+00:00
Cleaning .pytest_cache and .egg-info to cleaning everything up

- - - - -


6 changed files:

- + debian/compat
- debian/control
- debian/copyright
- debian/patches/0001-removed-coveralls-from-test-requirements.patch
- debian/rules
- debian/watch


Changes:

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


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Joachim Langenbach <joachim.langenbach at engsas.de>
 Section: science
 Testsuite: autopkgtest-pkg-python
 Priority: optional
-Build-Depends: debhelper-compat (= 10),
+Build-Depends: debhelper (>= 10~),
                dh-python,
                python3-all,
                python3-click,


=====================================
debian/copyright
=====================================
@@ -7,10 +7,6 @@ Files: *
 Copyright: 2014-2017, Sean Gillies <sean at mapbox.com>
 License: BSD-3-clause
 
-Files: docs/*
-Copyright: 2017, Sean Gillies <sean at mapbox.com>
-License: BSD-3-clause
-
 Files: debian/*
 Copyright: 2020, Joachim Langenbach <joachim.langenbach at engsas.de>
 License: BSD-3-clause


=====================================
debian/patches/0001-removed-coveralls-from-test-requirements.patch
=====================================
@@ -3,8 +3,9 @@ Description: Removed coveralls from test requirements
  pytests run during the packaging process.
 Author: Joachim Langenbach <joachim.langenbach at engsas.de>
 Forwarded: not-needed
---- mercantile-1.1.3.orig/setup.py
-+++ mercantile-1.1.3/setup.py
+
+--- a/setup.py
++++ b/setup.py
 @@ -38,7 +38,7 @@ setup(
      install_requires=["click>=3.0"],
      extras_require={


=====================================
debian/rules
=====================================
@@ -8,16 +8,19 @@ export PYBUILD_TEST_PYTEST=1
 
 override_dh_auto_clean:
 	dh_auto_clean
-	(cd docs && make clean)
-	rm -Rf .egg-info
-	rm -Rf .pytest_cache
+
+	make -C docs clean
+	$(RM) -R .pytest_cache
+	$(RM) -R *.egg-info
 
 override_dh_auto_build:
 	dh_auto_build
+
 	PYTHONPATH=$(CURDIR):$(CURDIR)/docs make -C docs html
 
 override_dh_auto_install:
 	dh_auto_install
+
 	# Move usr/bin/mercantile to mercantile package
 	mkdir -p debian/mercantile/usr
 	mv debian/python3-mercantile/usr/bin debian/mercantile/usr


=====================================
debian/watch
=====================================
@@ -3,4 +3,4 @@ opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 filenamemangle=s/(?:.*?\/)?(?:rel|r|v|mercantile)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/mercantile-$1.$2/ \
-  https://github.com/mapbox/mercantile/tags .*/v?(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+  https://github.com/mapbox/mercantile/tags (?:.*/archive/)?(?:rel|r|v|mercantile)?[\-\_]?(\d\S+(?<!post\d))\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/debian-gis-team/mercantile/-/compare/4fc75e4aec26da76ff64dbf8dc2159b4f2939cbd...7aa87d04bbf40f10ca28f634b9c3948d74d8ec98

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mercantile/-/compare/4fc75e4aec26da76ff64dbf8dc2159b4f2939cbd...7aa87d04bbf40f10ca28f634b9c3948d74d8ec98
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/20200503/cb87c4e2/attachment-0001.html>