Bas Couwenberg pushed to branch master at Debian GIS Project / pycsw
Commits: f571a9e0 by Johan Van de Wauw at 2018-03-22T11:45:01+01:00 Refresh patches Remove the default config patch - needs to be handled differently. - - - - - 4 changed files: - debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch - − debian/patches/0005-Set-default-configuration-path-for-wsgi.patch - debian/patches/0006-Don-t-include-external-references-to-images.patch - debian/patches/series Changes: ===================================== debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch ===================================== --- a/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch +++ b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch @@ -6,12 +6,12 @@ Subject: Use xdg-open instead of firefox in desktop file etc/pycsw.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/etc/pycsw.desktop -+++ b/etc/pycsw.desktop -@@ -4,7 +4,7 @@ Encoding=UTF-8 +--- pycsw.orig/etc/pycsw.desktop ++++ pycsw/etc/pycsw.desktop +@@ -3,7 +3,7 @@ + Encoding=UTF-8 Name=pycsw Comment=pycsw catalog server - Categories=Application;Education;Geography; -Exec=firefox http://localhost/pycsw/tests/index.html +Exec=xdg-open http://localhost/pycsw/tests/index.html Icon=/var/www/html/pycsw/docs/_static/pycsw-logo.png ===================================== debian/patches/0005-Set-default-configuration-path-for-wsgi.patch deleted ===================================== --- a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Johan Van de Wauw <johan.vandew...@gmail.com> -Date: Sat, 11 Oct 2014 14:32:03 +0200 -Subject: Set default configuration path for wsgi - ---- a/pycsw/wsgi.py -+++ b/pycsw/wsgi.py -@@ -65,7 +65,7 @@ PYCSW_ROOT = os.path.dirname(os.path.dir - - def application(env, start_response): - """WSGI wrapper""" -- config = 'default.cfg' -+ config = '/etc/pycsw/default.cfg' - - if 'PYCSW_CONFIG' in env: - config = env['PYCSW_CONFIG'] ===================================== debian/patches/0006-Don-t-include-external-references-to-images.patch ===================================== --- a/debian/patches/0006-Don-t-include-external-references-to-images.patch +++ b/debian/patches/0006-Don-t-include-external-references-to-images.patch @@ -6,29 +6,30 @@ Subject: Don't include external references to images docs/_templates/indexsidebar.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---- a/docs/_templates/indexsidebar.html -+++ b/docs/_templates/indexsidebar.html -@@ -1,19 +1,15 @@ +--- pycsw.orig/docs/_templates/indexsidebar.html ++++ pycsw/docs/_templates/indexsidebar.html +@@ -1,19 +1,19 @@ <p> - <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"; height="74"/></a> -+ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><span title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries.">OGC CSW 3.0.0 compliant</span></a> ++ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";>This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif</a> </p> <p> - <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%203.0.0&r=1"; height="38"/></a> -+ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><span title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries.">OGC CSW 2.0.2 compliant</span></a> ++ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";>This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%203.0.0&r=1</a> </p> <p> - <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%202.0.2&r=1"; height="38"/></a> -+ <a href="http://www.osgeo.org/";>OSGeo Project</a> ++ <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";>This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 2.0.2. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/badge.php?s=CAT%20CSW%202.0.2&r=1</a> + </p> + + <p> +- <img alt="OSGeo Project" src="https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png"; height="64"/> ++ OSGeo Project </p> <p> -- <img alt="OSGeo Project" src="http://svn.osgeo.org/osgeo/marketing/logo/png8/150/OSGeo_project.png"; height="64"/> --</p> -- --<p> - <script type="text/javascript" src="https://www.openhub.net/p/488022/widgets/project_thin_badge.js";></script> -+ <a href="https://www.openhub.net/p/pycsw";>Open HUB</a> ++<a href="https://www.openhub.net/p/pycsw";>OpenHub Statistics</a> </p> ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 0001-Remove-google-analytics.patch 0002-Remove-externally-linked-files.patch 0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch -0005-Set-default-configuration-path-for-wsgi.patch 0006-Don-t-include-external-references-to-images.patch pavement.patch offline-tests.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/commit/f571a9e0e0871c44b68659bbf8b6184a0b0f6741 --- View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/commit/f571a9e0e0871c44b68659bbf8b6184a0b0f6741 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
![https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"](https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"){kind=link}
![https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png"](https://raw.githubusercontent.com/OSGeo/osgeo/master/incubation/project/OSGeo_project.png"){kind=link}
![http://svn.osgeo.org/osgeo/marketing/logo/png8/150/OSGeo_project.png"](http://svn.osgeo.org/osgeo/marketing/logo/png8/150/OSGeo_project.png"){kind=link}