This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pycsw.
commit c8c690a2516555d986ed86e56a1911a85aed8151
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Jul 12 02:41:37 2016 +0200
Restructure binary packages.
Changes:
- Make pycsw the main binary package, containing pycsw-admin,
default-sample.cfg & examples.
- Drop 'python-' prefix from -doc & -wsgi packages,
turn old packages into transitional packages.
- Use dh_apache2 to install pywps.conf in /etc/apache2/conf-available,
don't enable it via maintainer scripts.
---
debian/changelog | 13 +++
debian/control | 93 ++++++++++++++++++++--
...ython-pycsw-doc.doc-base => pycsw-doc.doc-base} | 4 +-
debian/{python-pycsw-doc.docs => pycsw-doc.docs} | 0
...ntian-overrides => pycsw-doc.lintian-overrides} | 2 +-
debian/pycsw-wsgi.apache2 | 1 +
debian/{pycsw.conf => pycsw-wsgi.conf} | 0
debian/pycsw-wsgi.install | 4 +
.../{python-pycsw-wsgi.links => pycsw-wsgi.links} | 0
debian/pycsw.docs | 5 ++
debian/pycsw.examples | 1 +
debian/pycsw.install | 2 +
debian/{python-pycsw.manpages => pycsw.manpages} | 0
debian/python-pycsw-wsgi.install | 12 ---
debian/python-pycsw-wsgi.postinst | 16 ----
debian/python-pycsw-wsgi.prerm | 14 ----
debian/python-pycsw.install | 4 +-
debian/rules | 4 +
18 files changed, 119 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4782fcf..0d0bfd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+pycsw (2.0.0+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Restructure binary packages, changes:
+ - Make pycsw the main binary package, containing pycsw-admin,
+ default-sample.cfg & examples.
+ - Drop 'python-' prefix from -doc & -wsgi packages,
+ 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.
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 12 Jul 2016 02:20:17 +0200
+
pycsw (2.0.0+dfsg-1~exp2) experimental; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 2c6d720..d3e1183 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,33 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pycsw.git
Homepage: http://pycsw.org
X-Python-Version: >= 2.5
+Package: pycsw
+Architecture: all
+Section: non-free/web
+Depends: pycsw-wsgi (= ${binary:Version}),
+ python,
+ python-pycsw (= ${binary:Version}),
+ ${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
+ 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 contains the pycsw-admin utility and configuration files.
+
Package: python-pycsw
Architecture: all
Depends: ${python:Depends},
@@ -42,7 +69,6 @@ Depends: ${python:Depends},
python-tz,
python-xmltodict,
${misc:Depends}
-Recommends: python-pycsw-wsgi
Description: OGC compliant metadata (Catalogue service for the Web) server
pycsw is an OGC CSW server implementation written in Python. pycsw fully
implements the OpenGIS Catalogue Service Implementation Specification
@@ -57,10 +83,11 @@ Description: OGC compliant metadata (Catalogue service for
the Web) server
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 plugin (python-pycsw-wsgi).
+ the Apache mod_wsgi script (pycsw-wsgi).
-Package: python-pycsw-wsgi
+Package: pycsw-wsgi
Architecture: all
+Section: non-free/web
Depends: libapache2-mod-wsgi,
libjs-jquery,
python,
@@ -68,7 +95,9 @@ Depends: libapache2-mod-wsgi,
python-sqlalchemy,
${misc:Depends}
Recommends: ${misc:Recommends}
-Description: WSGI Apache CSW service based on python-pycsw
+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
(Catalogue Service for the Web). Initial development started in 2010
@@ -81,14 +110,60 @@ Description: WSGI Apache CSW service based on python-pycsw
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 Apache wsgi plugin (python-pycsw-wsgi).
+ This package contains the Apache mod_wsgi scripts and tests.
-Package: python-pycsw-doc
+Package: python-pycsw-wsgi
+Architecture: all
+Section: non-free/oldlibs
+Priority: extra
+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}
-Description: OGC compliant metadata (Catalogue Service for the Web) server
+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
+ (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 contains the pycsw documentation.
+
+Package: python-pycsw-doc
+Architecture: all
+Section: non-free/oldlibs
+Priority: extra
+Depends: pycsw-doc (= ${binary:Version}),
+ ${misc:Depends}
+Description: Transitional dummy package to pycsw-doc
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
@@ -101,4 +176,6 @@ 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 documentation.
+ This package is a transitional package from python-pycsw-doc to pycsw-doc.
+ It can safely be removed.
+
diff --git a/debian/python-pycsw-doc.doc-base b/debian/pycsw-doc.doc-base
similarity index 60%
rename from debian/python-pycsw-doc.doc-base
rename to debian/pycsw-doc.doc-base
index d74f087..dbb8d30 100644
--- a/debian/python-pycsw-doc.doc-base
+++ b/debian/pycsw-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the pycsw manual
Section: Science/Geoscience
Format: HTML
-Index: /usr/share/doc/python-pycsw-doc/index.html
-Files: /usr/share/doc/python-pycsw-doc/*.html
+Index: /usr/share/doc/pycsw-doc/index.html
+Files: /usr/share/doc/pycsw-doc/*.html
diff --git a/debian/python-pycsw-doc.docs b/debian/pycsw-doc.docs
similarity index 100%
rename from debian/python-pycsw-doc.docs
rename to debian/pycsw-doc.docs
diff --git a/debian/python-pycsw-doc.lintian-overrides
b/debian/pycsw-doc.lintian-overrides
similarity index 61%
rename from debian/python-pycsw-doc.lintian-overrides
rename to debian/pycsw-doc.lintian-overrides
index ca5eba3..7bcc73d 100644
--- a/debian/python-pycsw-doc.lintian-overrides
+++ b/debian/pycsw-doc.lintian-overrides
@@ -1,3 +1,3 @@
# File incorrectly recognised as a license file
# In fact this file (and dir) should not be installed, but if I omit _sources
dh_sphinxdoc fails
-python-pycsw-doc: extra-license-file
usr/share/doc/python-pycsw-doc/_sources/license.txt
+pycsw-doc: extra-license-file usr/share/doc/pycsw-doc/_sources/license.txt
diff --git a/debian/pycsw-wsgi.apache2 b/debian/pycsw-wsgi.apache2
new file mode 100644
index 0000000..c7df266
--- /dev/null
+++ b/debian/pycsw-wsgi.apache2
@@ -0,0 +1 @@
+conf debian/pycsw-wsgi.conf
diff --git a/debian/pycsw.conf b/debian/pycsw-wsgi.conf
similarity index 100%
rename from debian/pycsw.conf
rename to debian/pycsw-wsgi.conf
diff --git a/debian/pycsw-wsgi.install b/debian/pycsw-wsgi.install
new file mode 100644
index 0000000..f6404ac
--- /dev/null
+++ b/debian/pycsw-wsgi.install
@@ -0,0 +1,4 @@
+csw.py usr/share/pycsw/
+pycsw/wsgi.py usr/share/pycsw/
+tests/* usr/share/pycsw/tests/
+debian/default.cfg etc/pycsw/
diff --git a/debian/python-pycsw-wsgi.links b/debian/pycsw-wsgi.links
similarity index 100%
rename from debian/python-pycsw-wsgi.links
rename to debian/pycsw-wsgi.links
diff --git a/debian/pycsw.docs b/debian/pycsw.docs
new file mode 100644
index 0000000..3d1bae5
--- /dev/null
+++ b/debian/pycsw.docs
@@ -0,0 +1,5 @@
+COMMITTERS.txt
+CONTRIBUTING.rst
+HISTORY.txt
+README.txt
+VERSION.txt
diff --git a/debian/pycsw.examples b/debian/pycsw.examples
new file mode 100644
index 0000000..c5b3ffc
--- /dev/null
+++ b/debian/pycsw.examples
@@ -0,0 +1 @@
+etc/*
diff --git a/debian/pycsw.install b/debian/pycsw.install
new file mode 100644
index 0000000..5ce400a
--- /dev/null
+++ b/debian/pycsw.install
@@ -0,0 +1,2 @@
+default-sample.cfg etc/pycsw/
+usr/bin
diff --git a/debian/python-pycsw.manpages b/debian/pycsw.manpages
similarity index 100%
rename from debian/python-pycsw.manpages
rename to debian/pycsw.manpages
diff --git a/debian/python-pycsw-wsgi.install b/debian/python-pycsw-wsgi.install
deleted file mode 100644
index cf62b9b..0000000
--- a/debian/python-pycsw-wsgi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-etc/harvest-all.cron /etc/pycsw
-etc/mappings.py /etc/pycsw
-bin/* /usr/share/pycsw/bin/
-tests/* /usr/share/pycsw/tests/
-debian/pycsw.conf /etc/apache2/sites-available/
-csw.py /usr/share/pycsw/
-pycsw/wsgi.py /usr/share/pycsw/
-README.txt /usr/share/pycsw/
-VERSION.txt /usr/share/pycsw/
-HISTORY.txt /usr/share/pycsw/
-default-sample.cfg /etc/pycsw/
-debian/default.cfg /etc/pycsw/
diff --git a/debian/python-pycsw-wsgi.postinst
b/debian/python-pycsw-wsgi.postinst
deleted file mode 100644
index 83ce26a..0000000
--- a/debian/python-pycsw-wsgi.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ] ; then
- if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke enmod wsgi || exit $?
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke ensite pycsw || exit $?
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-pycsw-wsgi.prerm b/debian/python-pycsw-wsgi.prerm
deleted file mode 100644
index 8db6e43..0000000
--- a/debian/python-pycsw-wsgi.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#/bin/sh
-
-set -e
-
-if [ "$1" = remove ] ; then
- if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke dissite pycsw || exit $?
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-pycsw.install b/debian/python-pycsw.install
old mode 100755
new mode 100644
index c9d4e2e..b2cc136
--- a/debian/python-pycsw.install
+++ b/debian/python-pycsw.install
@@ -1,3 +1 @@
-#!/usr/bin/dh-exec
-debian/tmp/usr/lib
-bin/pycsw-admin.py => /usr/bin/pycsw-admin
+usr/lib/python2*
diff --git a/debian/rules b/debian/rules
index 3892788..777a7c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,10 @@ override_dh_auto_test:
PYBUILD_TEST_ARGS="cd {dir} && PYTHONPATH={dir} paver test" \
PYBUILD_AFTER_TEST="rm -rf {dir}/tests/results/" dh_auto_test
+override_dh_auto_install:
+ dh_auto_install
+ mv debian/tmp/usr/bin/pycsw-admin.py debian/tmp/usr/bin/pycsw-admin
+
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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
