[pycsw] 03/05: Refresh patches/remove obsolete patches
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Fri Mar 23 15:10:09 UTC 2018
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository pycsw.
commit 7ea3b1ce1a77f55f6b128795f2a40abeb91df450
Author: Johan Van de Wauw <johan at gisky.be>
Date: Fri Mar 23 13:59:42 2018 +0100
Refresh patches/remove obsolete patches
---
debian/patches/desktop-file.patch | 18 -----------------
debian/patches/offline-tests.patch | 40 --------------------------------------
debian/patches/pavement.patch | 23 ----------------------
debian/patches/series | 3 ---
4 files changed, 84 deletions(-)
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
deleted file mode 100644
index 21c04e5..0000000
--- a/debian/patches/desktop-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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 at 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
diff --git a/debian/patches/offline-tests.patch b/debian/patches/offline-tests.patch
deleted file mode 100644
index f8fe24b..0000000
--- a/debian/patches/offline-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Disable GetRecords-distributedsearch test, requires network.
-Author: Bas Couwenberg <sebastic at 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>
diff --git a/debian/patches/pavement.patch b/debian/patches/pavement.patch
deleted file mode 100644
index 7c44e0f..0000000
--- a/debian/patches/pavement.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Don't rely on pycsw-admin.py in $PATH for paver tests.
-Author: Bas Couwenberg <sebastic at 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([
diff --git a/debian/patches/series b/debian/patches/series
index f9bc98a..8afd4d3 100644
--- a/debian/patches/series
+++ b/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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git
More information about the Pkg-grass-devel
mailing list