[Git][debian-gis-team/mapproxy][master] 2 commits: Drop Python 2 support.

Bas Couwenberg gitlab at salsa.debian.org
Sun Jul 21 09:04:10 BST 2019



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


Commits:
bc7861a0 by Bas Couwenberg at 2019-07-21T07:52:15Z
Drop Python 2 support.

- - - - -
f48ed0ef by Bas Couwenberg at 2019-07-21T07:52:25Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/mapproxy.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,12 @@
-mapproxy (1.11.0-4) UNRELEASED; urgency=medium
+mapproxy (1.11.0-4) unstable; urgency=medium
 
   * Bump Standards-Version to 4.4.0, no changes.
   * Update watch file to limit matches to archive path.
   * Drop unused override for python-module-in-wrong-location.
   * Update gbp.conf to use --source-only-changes by default.
+  * Drop Python 2 support.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Aug 2018 20:28:55 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 21 Jul 2019 09:52:17 +0200
 
 mapproxy (1.11.0-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -6,19 +6,6 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                libgdal-dev,
-               python-all,
-               python-lxml,
-               python-nose,
-               python-pil,
-               python-pkg-resources,
-               python-redis,
-               python-requests,
-               python-setuptools,
-               python-shapely,
-               python-sphinx,
-               python-sphinx-bootstrap-theme,
-               python-webtest,
-               python-yaml,
                python3-all,
                python3-lxml,
                python3-nose,
@@ -44,11 +31,9 @@ Homepage: http://mapproxy.org/
 Package: mapproxy
 Architecture: all
 Section: web
-Depends: python-mapproxy (= ${binary:Version}),
+Depends: python3-mapproxy (= ${binary:Version}),
          ${misc:Depends}
 Suggests: mapproxy-doc
-Breaks: python-mapproxy (<< 1.8.2-1~)
-Replaces: python-mapproxy (<< 1.8.2-1~)
 Description: open source proxy for geospatial data
  MapProxy is an open source proxy for geospatial data. It caches, accelerates
  and transforms data from existing map services and serves any desktop or web
@@ -59,32 +44,6 @@ Description: open source proxy for geospatial data
  .
  This package provides the mapproxy utilities.
 
-Package: python-mapproxy
-Architecture: all
-Depends: fonts-dejavu-core,
-         python-pil,
-         python-pkg-resources,
-         python-pyproj,
-         python-yaml,
-         ${python:Depends},
-         ${misc:Depends}
-Recommends: python-boto3,
-            python-botocore,
-            python-gdal,
-            python-lxml,
-            python-pastedeploy,
-            python-redis,
-            python-shapely
-Description: open source proxy for geospatial data - Python 2 module
- MapProxy is an open source proxy for geospatial data. It caches, accelerates
- and transforms data from existing map services and serves any desktop or web
- GIS client.
- .
- MapProxy is a tile server (WMS-C, TMS, WMTS, KML SuperOverlays), and also a
- fully compliant WMS server supporting any WMS client (desktop and web).
- .
- This package provides the mapproxy module for Python 2.
-
 Package: python3-mapproxy
 Architecture: all
 Depends: fonts-dejavu-core,


=====================================
debian/mapproxy.links
=====================================
@@ -1,2 +1,2 @@
-usr/lib/python-mapproxy/mapproxy-seed usr/bin/mapproxy-seed
-usr/lib/python-mapproxy/mapproxy-util usr/bin/mapproxy-util
+usr/lib/python3-mapproxy/mapproxy-seed usr/bin/mapproxy-seed
+usr/lib/python3-mapproxy/mapproxy-util usr/bin/mapproxy-util


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ BUILD_DATE=$(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)")
 MANPAGES := $(wildcard debian/man/*.*.xml)
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean debian/man/*.1
@@ -41,41 +41,6 @@ override_dh_auto_install:
 	# Remove duplicate license file
 	$(RM) debian/*/usr/lib/python*/dist-packages/mapproxy/image/fonts/LICENSE
 
-	for V in `pyversions -v -s`; do \
-		for F in DejaVuSans.ttf DejaVuSansMono.ttf; do \
-			$(RM) debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
-			ln -s /usr/share/fonts/truetype/dejavu/$$F \
-			      debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \
-		done ; \
-		if [ ! -e debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/service/templates ]; then \
-			mkdir -p debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/service ; \
-			mv debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/service/templates \
-			   debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/service/ ; \
-		else \
-			$(RM) -r debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/service/templates ; \
-		fi ; \
-		ln -s /usr/share/python-$(PYBUILD_NAME)/service/templates \
-		      debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/service/templates ; \
-		if [ ! -e debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test/schemas ]; then \
-			mkdir -p debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test ; \
-			mv debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/schemas \
-			   debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test/ ; \
-		else \
-			$(RM) -r debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/schemas ; \
-		fi ; \
-		ln -s /usr/share/python-$(PYBUILD_NAME)/test/schemas \
-		      debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/schemas ; \
-		if [ ! -e debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test/system/fixture/cache_data ]; then \
-			mkdir -p debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test/system/fixture ; \
-			mv debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/system/fixture/cache_data \
-			   debian/python-$(PYBUILD_NAME)/usr/share/python-$(PYBUILD_NAME)/test/system/fixture/ ; \
-		else \
-			$(RM) -r debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/system/fixture/cache_data ; \
-		fi ; \
-		ln -s /usr/share/python-$(PYBUILD_NAME)/test/system/fixture/cache_data \
-		      debian/python-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/test/system/fixture/cache_data ; \
-	done
-
 	for V in `py3versions -v -s`; do \
 		for F in DejaVuSans.ttf DejaVuSansMono.ttf; do \
 			$(RM) debian/python3-$(PYBUILD_NAME)/usr/lib/python$$V/dist-packages/mapproxy/image/fonts/$$F ; \



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/compare/26e6117955b556c9e699bef2ef24b7a99f407660...f48ed0efdce3435a92ecfbb78a322e6abf75a323

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/compare/26e6117955b556c9e699bef2ef24b7a99f407660...f48ed0efdce3435a92ecfbb78a322e6abf75a323
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/20190721/d681b837/attachment-0001.html>


More information about the Pkg-grass-devel mailing list