debian/changelog

-pycsw (2.4.0+dfsg-2) UNRELEASED; urgency=medium
+pycsw (2.4.0+dfsg-2) unstable; urgency=medium
 
+  * Team upload.
   * Bump Standards-Version to 4.4.0, no changes.
+  * Switch to Python 3 only.
+  * Drop obsolete Breaks/Replaces.
+  * Drop obsolete transitional package.
 
- -- Bas Couwenberg <sebastic@debian.org>  Wed, 10 Jul 2019 18:58:05 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 13 Jul 2019 22:45:08 +0200
 
 pycsw (2.4.0+dfsg-1) unstable; urgency=medium
 

debian/control

@@ -10,24 +10,6 @@ Build-Depends: apache2-dev,
                dh-exec,
                dh-python,
                procps,
-               python-all,
-               python-apipkg,
-               python-geolinks,
-               python-lxml,
-               python-mock,
-               python-owslib,
-               python-paver,
-               python-pyproj,
-               python-pytest,
-               python-pytest-cov,
-               python-pytest-timeout,
-               python-setuptools,
-               python-shapely,
-               python-six,
-               python-sphinx,
-               python-sqlalchemy,
-               python-tz,
-               python-xmltodict,
                python3-all,
                python3-apipkg,
                python3-geolinks,
@@ -55,13 +37,9 @@ Package: pycsw
 Architecture: all
 Section: non-free/web
 Depends: pycsw-wsgi (= ${binary:Version}),
-         python,
-         python-pycsw (= ${binary:Version}),
+         python3-pycsw (= ${binary:Version}),
+         ${python3:Depends},
          ${misc:Depends}
-Breaks: python-pycsw (<< 2.0.0+dfsg-1~exp3),
-        python-pycsw-wsgi (<< 2.0.0+dfsg-1~exp3)
-Replaces: python-pycsw (<< 2.0.0+dfsg-1~exp3),
-          python-pycsw-wsgi (<< 2.0.0+dfsg-1~exp3)
 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
@@ -78,37 +56,9 @@ Description: OGC compliant metadata (Catalogue Service for the Web) server
  .
  This package contains the pycsw-admin utility and configuration files.
 
-Package: python-pycsw
-Architecture: all
-Depends: ${python:Depends},
-         python-geolinks,
-         python-lxml,
-         python-owslib,
-         python-pyproj,
-         python-shapely,
-         python-six,
-         python-tz,
-         python-xmltodict,
-         ${misc:Depends}
-Description: OGC compliant metadata (Catalogue Service for the Web) server - Python 2
- 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 the pycsw module for Python 2.
-
 Package: python3-pycsw
 Architecture: all
-Depends: ${python3:Depends},
-         python3-geolinks,
+Depends: python3-geolinks,
          python3-lxml,
          python3-owslib,
          python3-pyproj,
@@ -116,6 +66,7 @@ Depends: ${python3:Depends},
          python3-six,
          python3-tz,
          python3-xmltodict,
+         ${python3:Depends},
          ${misc:Depends}
 Description: OGC compliant metadata (Catalogue Service for the Web) server - Python 3
  pycsw is an OGC CSW server implementation written in Python. pycsw fully
@@ -137,13 +88,11 @@ Architecture: all
 Section: non-free/web
 Depends: libapache2-mod-wsgi,
          libjs-jquery,
-         python,
-         python-pycsw (= ${binary:Version}),
-         python-sqlalchemy,
+         python3-pycsw (= ${binary:Version}),
+         python3-sqlalchemy,
+         ${python3:Depends},
          ${misc:Depends}
 Recommends: ${misc:Recommends}
-Breaks: python-pycsw-wsgi (<< 2.0.0+dfsg-1~exp3)
-Replaces: python-pycsw-wsgi (<< 2.0.0+dfsg-1~exp3)
 Description: WSGI Apache CSW service based on pycsw
  pycsw is an OGC CSW server implementation written in Python. pycsw fully
  implements the OpenGIS Catalogue Service Implementation Specification
@@ -159,35 +108,11 @@ Description: WSGI Apache CSW service based on pycsw
  .
  This package contains the Apache mod_wsgi scripts and tests.
 
-Package: python-pycsw-wsgi
-Architecture: all
-Section: non-free/oldlibs
-Depends: pycsw (= ${binary:Version}),
-         pycsw-wsgi (= ${binary:Version}),
-         ${misc:Depends}
-Description: Transitional dummy package to pycsw-wsgi
- 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 is a transitional package from python-pycsw-wsgi to pycsw-wsgi.
- It can safely be removed.
-
 Package: pycsw-doc
 Architecture: all
 Section: non-free/doc
 Depends: ${sphinxdoc:Depends},
          ${misc:Depends}
-Breaks: python-pycsw-doc (<< 2.0.0+dfsg-1~exp3)
-Replaces: python-pycsw-doc (<< 2.0.0+dfsg-1~exp3)
 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

debian/pycsw-wsgi.lintian-overrides

-# Will switch to Python 3 when Python 2 is EOL.
-dependency-on-python-version-marked-for-end-of-life (Depends: python)
-

debian/pycsw.links

-usr/lib/python-pycsw/pycsw-admin.py usr/bin/pycsw-admin
+usr/lib/python3-pycsw/pycsw-admin.py usr/bin/pycsw-admin

debian/pycsw.lintian-overrides

-# Will switch to Python 3 when Python 2 is EOL.
-dependency-on-python-version-marked-for-end-of-life (Depends: python)
-

debian/rules

@@ -8,7 +8,7 @@ include /usr/share/dpkg/pkg-info.mk
 BUILD_DATE := $(shell LC_ALL=C date -u "+%Y-%m-%d" -d "@$(SOURCE_DATE_EPOCH)")
 
 %:
-	dh  $@ --with python2,python3,sphinxdoc,apache2 --buildsystem pybuild --parallel
+	dh  $@ --with python3,sphinxdoc,apache2 --buildsystem pybuild --parallel
 
 override_dh_clean:
 	dh_clean debian/man/pycsw-admin.1
@@ -50,3 +50,7 @@ override_dh_install:
 	$(RM) debian/*/usr/share/pycsw/tests/README.txt
 	$(RM) debian/*/usr/share/pycsw/tests/functionaltests/suites/apiso/data/README.txt
 	$(RM) debian/*/usr/share/pycsw/tests/functionaltests/suites/cite/data/README.txt
+
+override_dh_python3:
+	dh_python3
+	dh_python3 -p pycsw-wsgi --shebang=/usr/bin/python3 /usr/share/pycsw