debian/changelog

@@ -12,8 +12,14 @@ pycsw (2.2.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Johan Van de Wauw ]
   * New upstream version 2.2.0+dfsg
-
- -- Johan Van de Wauw <johan@gisky.be>  Thu, 22 Mar 2018 01:36:42 +0100
+  * Refresh patches
+  * Adjust renamed document file
+  * Update copyright years
+  * Refresh patches/Remove obsolete patches
+  * Add python-mock as build-dependency
+  * Update my mailaddress
+
+ -- Johan Van de Wauw <johan@gisky.be>  Fri, 23 Mar 2018 16:06:47 +0100
 
 pycsw (2.0.3+dfsg-1) unstable; urgency=medium
 

debian/control

 Source: pycsw
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Angelos Tzotsos <gcpp.kalxas@gmail.com>,
-           Johan Van de Wauw <johan.vandewauw@gmail.com>
+           Johan Van de Wauw <johan@gisky.be>
 Section: non-free/python
 Priority: optional
 Build-Depends: apache2-dev,
@@ -13,6 +13,7 @@ Build-Depends: apache2-dev,
                python-all,
                python-geolinks,
                python-lxml,
+               python-mock,
                python-owslib,
                python-paver,
                python-pyproj,
@@ -26,6 +27,7 @@ Build-Depends: apache2-dev,
                python3-all,
                python3-geolinks,
                python3-lxml,
+               python3-mock,
                python3-owslib,
                python3-pyproj,
                python3-setuptools,

debian/copyright

@@ -8,7 +8,7 @@ Disclaimer: The package is in non-free because it contains OGC schemas which
 
 Files: *
 Copyright: 2010-2017, Tom Kralidis
-           2015-2016, Ricardo Garcia Silva
+           2015-2017, Ricardo Garcia Silva
                 2016, James F. Dickens
            2011-2015, Angelos Tzotsos
            2012-2015, Adam Hinz

debian/patches/desktop-file.patch

-Description: Fix desktop file validation errors.
- etc/pycsw.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
- etc/pycsw.desktop: error: file contains multiple keys named "Categories" in group "Desktop Entry"
- etc/pycsw.desktop: warning: value "Application;Education;Geography;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/geopython/pycsw/pull/473
-Applied-Upstream: https://github.com/geopython/pycsw/commit/cd425019eea7809f48609821c68c6afc42bf2dde
-
---- a/etc/pycsw.desktop
-+++ b/etc/pycsw.desktop
-@@ -3,7 +3,6 @@ Type=Application
- Encoding=UTF-8
- Name=pycsw
- Comment=pycsw catalog server
--Categories=Application;Education;Geography;
- Exec=xdg-open http://localhost/pycsw/tests/index.html
- Icon=/var/www/html/pycsw/docs/_static/pycsw-logo.png
- Terminal=false

debian/patches/offline-tests.patch

-Description: Disable GetRecords-distributedsearch test, requires network.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: not-needed
-
---- /dev/null
-+++ b/tests/suites/default/post/GetRecords-distributedsearch.disabled
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-+<csw:GetRecords xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" service="CSW" version="2.0.2" resultType="results" startPosition="1" maxRecords="5" outputFormat="application/xml" outputSchema="http://www.opengis.net/cat/csw/2.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
-+	<csw:DistributedSearch hopCount="2"/>
-+	<csw:Query typeNames="csw:Record">
-+		<csw:ElementSetName>brief</csw:ElementSetName>
-+                <csw:Constraint version="1.1.0">
-+                <ogc:Filter>
-+                    <ogc:PropertyIsEqualTo>
-+                        <ogc:PropertyName>dc:title</ogc:PropertyName>
-+                        <ogc:Literal>Aquifers</ogc:Literal>
-+                    </ogc:PropertyIsEqualTo>
-+                </ogc:Filter>
-+            </csw:Constraint>
-+	</csw:Query>
-+</csw:GetRecords>
---- a/tests/suites/default/post/GetRecords-distributedsearch.xml
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
--<csw:GetRecords xmlns:csw="http://www.opengis.net/cat/csw/2.0.2" xmlns:ogc="http://www.opengis.net/ogc" service="CSW" version="2.0.2" resultType="results" startPosition="1" maxRecords="5" outputFormat="application/xml" outputSchema="http://www.opengis.net/cat/csw/2.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd">
--	<csw:DistributedSearch hopCount="2"/>
--	<csw:Query typeNames="csw:Record">
--		<csw:ElementSetName>brief</csw:ElementSetName>
--                <csw:Constraint version="1.1.0">
--                <ogc:Filter>
--                    <ogc:PropertyIsEqualTo>
--                        <ogc:PropertyName>dc:title</ogc:PropertyName>
--                        <ogc:Literal>Aquifers</ogc:Literal>
--                    </ogc:PropertyIsEqualTo>
--                </ogc:Filter>
--            </csw:Constraint>
--	</csw:Query>
--</csw:GetRecords>

debian/patches/pavement.patch

-Description: Don't rely on pycsw-admin.py in $PATH for paver tests.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: not-needed
-
---- a/pavement.py
-+++ b/pavement.py
-@@ -166,13 +166,13 @@ def setup_testdata():
-     for database, has_testdata in test_database_parameters.items():
-         info('Setting up test database %s' % database)
-         cfg = path('tests/suites/%s/default.cfg' % database)
--        sh('pycsw-admin.py -c setup_db -f %s' % cfg)
-+        sh('python bin/pycsw-admin.py -c setup_db -f %s' % cfg)
-         if has_testdata:
-             datapath = path('tests/suites/%s/data' % database)
-             info('Loading test data from %s' % datapath)
--            sh('pycsw-admin.py -c load_records -f %s -p %s' % (cfg, datapath))
-+            sh('python bin/pycsw-admin.py -c load_records -f %s -p %s' % (cfg, datapath))
-             exportpath = path('tests/results/exports')
--            sh('pycsw-admin.py -c export_records -f %s -p %s' % (cfg, exportpath))
-+            sh('python bin/pycsw-admin.py -c export_records -f %s -p %s' % (cfg, exportpath))
- 
- @task
- @cmdopts([

debian/patches/series

@@ -2,6 +2,3 @@
 0002-Remove-externally-linked-files.patch
 0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
 0006-Don-t-include-external-references-to-images.patch
-pavement.patch
-offline-tests.patch
-desktop-file.patch

debian/pycsw.docs

 COMMITTERS.txt
 CONTRIBUTING.rst
 HISTORY.txt
-README.txt
+README.rst
 VERSION.txt