[pycsw] 01/02: Merge changelog entries and fix DEP-3 patch headers for geolinks patch.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pycsw.

commit 77b697b59ff2c971a16c4ba5fe9b81e8c8fa8955
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 10 19:31:54 2016 +0200

    Merge changelog entries and fix DEP-3 patch headers for geolinks patch.
---
 debian/changelog                             | 11 +++++------
 debian/patches/0007-Use-geolinks-0.2.0.patch | 28 ++++++----------------------
 debian/patches/series                        |  2 +-
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efdc368..835651a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,13 @@
-pycsw (1.10.4+dfsg-3) UNRELEASED; urgency=medium
-
-  * Added upstream 1.10.x patch to use geolinks 0.2.0.
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com>  Fri, 10 Jun 2016 19:04:00 +0200
-
 pycsw (1.10.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Bas Couwenberg ]
   * Add upstream metadata.
 
+  [ Angelos Tzotsos ]
+  * Added upstream 1.10.x patch to use geolinks 0.2.0.
+
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 09 Jun 2016 23:01:30 +0200
 
 pycsw (1.10.4+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/0007-Use-geolinks-0.2.0.patch b/debian/patches/0007-Use-geolinks-0.2.0.patch
index 491b37d..2e7d6d8 100644
--- a/debian/patches/0007-Use-geolinks-0.2.0.patch
+++ b/debian/patches/0007-Use-geolinks-0.2.0.patch
@@ -1,25 +1,9 @@
-Description: <Patch to use geolinks 0.2.0>
- .
- pycsw (1.10.4+dfsg-2~xenial2) xenial; urgency=medium
- .
-   * Applied patch to work with geolinks 0.2.0.
+Description: Use geolinks 0.2.0.
 Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
+Origin: https://github.com/geopython/pycsw/commit/ee6b8907941e3bc50fdda49dc02175a93e613f93
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pycsw-1.10.4+dfsg.orig/pycsw/metadata.py
-+++ pycsw-1.10.4+dfsg/pycsw/metadata.py
+--- 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
@@ -29,8 +13,8 @@ Last-Update: <YYYY-MM-DD>
  
  LOGGER = logging.getLogger(__name__)
  
---- pycsw-1.10.4+dfsg.orig/requirements.txt
-+++ pycsw-1.10.4+dfsg/requirements.txt
+--- a/requirements.txt
++++ b/requirements.txt
 @@ -1,4 +1,4 @@
 -geolinks==0.0.1
 +geolinks==0.2.0
diff --git a/debian/patches/series b/debian/patches/series
index 0494969..7e7d7f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
 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
\ No newline at end of file
+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