[pycsw] 04/18: Update patches.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pycsw.

commit fc2dc8074486a629e5cb7ccb9a34bfb9e211ef3d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 6 20:29:08 2016 +0200

    Update patches.
    
    Changes:
    - Drop 0003-*.patch, obsolete.
    - Drop 0007-Use-geolinks-0.2.0.patch, included upstream.
    - Refresh remaining patches.
---
 debian/changelog                                   |  4 ++++
 .../0002-Remove-externally-linked-files.patch      |  2 +-
 ...look-for-configuration-in-correct-etc-pat.patch | 19 ------------------
 ...5-Set-default-configuration-path-for-wsgi.patch | 10 +++-------
 debian/patches/0007-Use-geolinks-0.2.0.patch       | 23 ----------------------
 debian/patches/series                              |  2 --
 6 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d811f5..07d4022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ pycsw (2.0.0~rc1+dfsg-1) UNRELEASED; urgency=medium
     - Add copyright holders
     - Change license shortname from xmit to Expat
     - Add license & copyright for documentation
+  * Update patches, changes:
+    - Drop 0003-*.patch, obsolete.
+    - Drop 0007-Use-geolinks-0.2.0.patch, included upstream.
+    - Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Jul 2016 17:46:22 +0200
 
diff --git a/debian/patches/0002-Remove-externally-linked-files.patch b/debian/patches/0002-Remove-externally-linked-files.patch
index 6e98893..c15757e 100644
--- a/debian/patches/0002-Remove-externally-linked-files.patch
+++ b/debian/patches/0002-Remove-externally-linked-files.patch
@@ -18,7 +18,7 @@ W3C and jquery
          <script type="text/javascript">
              $(document).ready(function() {
                  $('.xml').change(function() {
-@@ -364,8 +364,6 @@
+@@ -463,8 +463,6 @@
              </ul>
          <hr/>
          <footer>
diff --git a/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch b/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
deleted file mode 100644
index 966cac9..0000000
--- a/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Mon, 29 Sep 2014 21:27:52 +0200
-Subject: Make pycsw look for configuration in correct /etc path
-
----
- csw.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/csw.py
-+++ b/csw.py
-@@ -36,7 +36,7 @@ import sys
- from StringIO import StringIO
- from pycsw import server
- 
--CONFIG = 'default.cfg'
-+CONFIG = '/etc/pycsw/default.cfg'
- GZIP = False
- 
- if 'PYCSW_CONFIG' in os.environ:
diff --git a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch b/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
index 93ee074..8b5e198 100644
--- a/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
+++ b/debian/patches/0005-Set-default-configuration-path-for-wsgi.patch
@@ -2,13 +2,9 @@ From: Johan Van de Wauw <johan.vandewauw at gmail.com>
 Date: Sat, 11 Oct 2014 14:32:03 +0200
 Subject: Set default configuration path for wsgi
 
----
- csw.wsgi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/csw.wsgi
-+++ b/csw.wsgi
-@@ -64,7 +64,7 @@ from pycsw import server
+--- 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"""
diff --git a/debian/patches/0007-Use-geolinks-0.2.0.patch b/debian/patches/0007-Use-geolinks-0.2.0.patch
deleted file mode 100644
index 2e7d6d8..0000000
--- a/debian/patches/0007-Use-geolinks-0.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Use geolinks 0.2.0.
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-Origin: https://github.com/geopython/pycsw/commit/ee6b8907941e3bc50fdda49dc02175a93e613f93
-
---- a/pycsw/metadata.py
-+++ b/pycsw/metadata.py
-@@ -34,7 +34,7 @@ from urlparse import urlparse
- from lxml import etree
- from owslib.util import build_get_url
- from pycsw import util
--from geolinks.links import sniff_link
-+from geolinks import sniff_link
- 
- LOGGER = logging.getLogger(__name__)
- 
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,4 +1,4 @@
--geolinks==0.0.1
-+geolinks==0.2.0
- lxml==3.3.5
- OWSLib<0.9.0
- pyproj==1.9.3
diff --git a/debian/patches/series b/debian/patches/series
index 7e7d7f1..609fe90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 0001-Remove-google-analytics.patch
 0002-Remove-externally-linked-files.patch
-0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.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
-0007-Use-geolinks-0.2.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git