[pycsw] 01/01: Refresh patches

Johan Van de Wauw Thu, 22 Mar 2018 03:58:37 -0700

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

johanvdw-guest pushed a commit to branch master
in repository pycsw.


commit f571a9e0e0871c44b68659bbf8b6184a0b0f6741
Author: Johan Van de Wauw <jo...@gisky.be>
Date:   Thu Mar 22 11:43:30 2018 +0100

    Refresh patches
    
    Remove the default config patch - needs to be handled differently.
---
 ...g-open-instead-of-firefox-in-desktop-file.patch |  8 ++++----
 ...5-Set-default-configuration-path-for-wsgi.patch | 15 --------------
 ...n-t-include-external-references-to-images.patch | 23 +++++++++++-----------
 debian/patches/series                              |  1 -
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git 
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
index 16218c6..71a4acd 100644
--- 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
diff --git a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch 
b/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
deleted file mode 100644
index 8b5e198..0000000
--- 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']
diff --git 
a/debian/patches/0006-Don-t-include-external-references-to-images.patch 
b/debian/patches/0006-Don-t-include-external-references-to-images.patch
index 037f4a3..c540dd7 100644
--- 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 Serv [...]
-+    <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 S [...]
++    <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 th [...]
  </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 Serv [...]
-+    <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 S [...]
++    <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 th [...]
  </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 Serv [...]
-+    <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 th [...]
+ </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>
diff --git a/debian/patches/series b/debian/patches/series
index 43b1309..f9bc98a 100644
--- 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

-- 
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

[pycsw] 01/01: Refresh patches

Reply via email to