[pgrouting] 04/07: Refresh patches.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pgrouting.

commit c4afafbaa8744aec2d13b8099a8ea067ee5411c1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 15 22:15:11 2017 +0200

    Refresh patches.
---
 debian/changelog                                       |  1 +
 debian/patches/extension-no-version                    | 15 ++++++++-------
 debian/patches/privacy-breach-uses-embedded-file.patch | 11 +++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27961f7..2c87d2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pgrouting (2.5.0-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 22:02:00 +0200
 
diff --git a/debian/patches/extension-no-version b/debian/patches/extension-no-version
index 9fc4adc..38530d1 100644
--- a/debian/patches/extension-no-version
+++ b/debian/patches/extension-no-version
@@ -1,13 +1,14 @@
-# Remove "from xxx" from the files so we can better de-duplicate them
+Description: Remove "from xxx" from the files so we can better de-duplicate them.
+Author:	Christoph Berg <myon at debian.org>
 
---- a/tools/build-extension-update-files.pl
-+++ b/tools/build-extension-update-files.pl
-@@ -226,7 +226,7 @@ sub write_script {
+--- a/sql/scripts/build-extension-update-files1.pl
++++ b/sql/scripts/build-extension-update-files1.pl
+@@ -660,7 +660,7 @@ sub write_script {
      # write out the header and the commands to clean up the old extension
      print OUT <<EOF;
  -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
---- pgRouting extension upgrade from $o_ver to $n_ver
-+-- pgRouting extension upgrade to $n_ver
+--- pgRouting extension upgrade from $old_version to $new_version
++-- pgRouting extension upgrade to $new_version
  -- generated by tools/build-extension-update-files
  -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -- remove functions no longer in the $n_ver extension
+ 
diff --git a/debian/patches/privacy-breach-uses-embedded-file.patch b/debian/patches/privacy-breach-uses-embedded-file.patch
index 5c71daf..1efa200 100644
--- a/debian/patches/privacy-breach-uses-embedded-file.patch
+++ b/debian/patches/privacy-breach-uses-embedded-file.patch
@@ -4,12 +4,11 @@ Forwarded: not-needed
 
 --- a/doc/conf.py.in
 +++ b/doc/conf.py.in
-@@ -26,7 +26,7 @@ needs_sphinx = '1.1'
- 
+@@ -27,6 +27,7 @@ needs_sphinx = '1.1'
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--mathjax_path="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
+ #mathjax_path="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
 +mathjax_path="mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
- extensions = ['sphinx.ext.todo', 'sphinx.ext.mathjax', 'sphinx.ext.graphviz']
- 
- # Add any paths that contain templates here, relative to this directory.
+ extensions = [
+         'sphinx.ext.todo',
+         'sphinx.ext.mathjax',

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