[pycsw] 02/03: Also build pycsw module for Python 3.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pycsw.

commit cfbca3509d18f92b86099605e263f75139ae5a44
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 12 02:46:03 2016 +0200

    Also build pycsw module for Python 3.
---
 debian/changelog            |  1 +
 debian/control              | 44 +++++++++++++++++++++++++++++++++++++++++---
 debian/pycsw.install        |  1 -
 debian/pycsw.links          |  1 +
 debian/python-pycsw.install |  1 -
 debian/rules                | 11 +++++++----
 6 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d0bfd2..1a77687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pycsw (2.0.0+dfsg-1~exp3) UNRELEASED; urgency=medium
       turn old packages into transitional packages.
     - Use dh_apache2 to install pycsw.conf in /etc/apache2/conf-available,
       don't enable it via maintainer scripts.
+  * Also build pycsw module for Python 3.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jul 2016 02:20:17 +0200
 
diff --git a/debian/control b/debian/control
index d3e1183..ed2ce1b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,18 @@ Build-Depends: apache2-dev,
                python-sqlalchemy,
                python-tz,
                python-xmltodict,
+               python3-all,
+               python3-geolinks,
+               python3-lxml,
+               python3-owslib,
+               python3-pyproj,
+               python3-setuptools,
+               python3-shapely,
+               python3-six,
+               python3-sphinx,
+               python3-sqlalchemy,
+               python3-tz,
+               python3-xmltodict,
                ruby-ronn
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pycsw.git
@@ -69,7 +81,7 @@ Depends: ${python:Depends},
          python-tz,
          python-xmltodict,
          ${misc:Depends}
-Description: OGC compliant metadata (Catalogue service for the Web) server 
+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
@@ -82,8 +94,34 @@ Description: OGC compliant metadata (Catalogue service for the Web) server
  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 necessary backend Python scripts for running
- the Apache mod_wsgi script (pycsw-wsgi).
+ This package the pycsw module for Python 2.
+
+Package: python3-pycsw
+Architecture: all
+Depends: ${python3:Depends},
+         python3-geolinks,
+         python3-lxml,
+         python3-owslib,
+         python3-pyproj,
+         python3-shapely,
+         python3-six,
+         python3-tz,
+         python3-xmltodict,
+         ${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
+ 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 3.
 
 Package: pycsw-wsgi
 Architecture: all
diff --git a/debian/pycsw.install b/debian/pycsw.install
index 5ce400a..6b8a687 100644
--- a/debian/pycsw.install
+++ b/debian/pycsw.install
@@ -1,2 +1 @@
 default-sample.cfg etc/pycsw/
-usr/bin
diff --git a/debian/pycsw.links b/debian/pycsw.links
new file mode 100644
index 0000000..8a14bd6
--- /dev/null
+++ b/debian/pycsw.links
@@ -0,0 +1 @@
+usr/lib/python-pycsw/pycsw-admin.py usr/bin/pycsw-admin
diff --git a/debian/python-pycsw.install b/debian/python-pycsw.install
deleted file mode 100644
index b2cc136..0000000
--- a/debian/python-pycsw.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*
diff --git a/debian/rules b/debian/rules
index 777a7c1..2e97d6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export PYBUILD_NAME=pycsw
+
 %:
-	dh  $@ --with python2,sphinxdoc,apache2 --buildsystem pybuild --parallel
+	dh  $@ --with python2,python3,sphinxdoc,apache2 --buildsystem pybuild --parallel
 
 override_dh_clean:
 	dh_clean debian/man/pycsw-admin.1 \
@@ -16,11 +18,12 @@ override_dh_auto_build:
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="cd {dir} && PYTHONPATH={dir} paver test" \
-	PYBUILD_AFTER_TEST="rm -rf {dir}/tests/results/" dh_auto_test
+	PYBUILD_AFTER_TEST="rm -rf {dir}/tests/results/" \
+	PYBUILD_DISABLE=test/python3 \
+	dh_auto_test
 
 override_dh_auto_install:
-	dh_auto_install
-	mv debian/tmp/usr/bin/pycsw-admin.py debian/tmp/usr/bin/pycsw-admin
+	PYBUILD_INSTALL_ARGS="--install-scripts=/usr/lib/{package}" dh_auto_install
 
 override_dh_install:
 	dh_install --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git