[python-shapely] 10/14: Refresh patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-shapely.

commit 925875b33d3200e34ded27a15a66fa3cdbe80c73
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 15:03:42 2015 +0200

    Refresh patches.
---
 debian/changelog                                             |  1 +
 debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch      |  3 ---
 debian/patches/0002-Retrieve-MathJax.js-locally.patch        |  2 --
 debian/patches/0003-Do-not-install-.pxi-file.patch           | 12 ++++--------
 debian/patches/0004-Remove-externally-referenced-image.patch |  2 --
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64c8298..16e92ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ python-shapely (1.5.12-1) UNRELEASED; urgency=medium
     - Add license & copyright for ftools.py
   * Use dh_clean for additional file removals.
   * Use dh_link for mathjax symlink.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Aug 2015 15:02:37 +0200
 
diff --git a/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch b/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
index c70fd67..8c3595a 100644
--- a/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
+++ b/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
@@ -7,9 +7,6 @@ Subject: setup.cfg to autobuild sphinx
  1 file changed, 4 insertions(+)
  create mode 100644 setup.cfg
 
-diff --git a/setup.cfg b/setup.cfg
-new file mode 100644
-index 0000000..693f88b
 --- /dev/null
 +++ b/setup.cfg
 @@ -0,0 +1,4 @@
diff --git a/debian/patches/0002-Retrieve-MathJax.js-locally.patch b/debian/patches/0002-Retrieve-MathJax.js-locally.patch
index ec3acf6..e58873d 100644
--- a/debian/patches/0002-Retrieve-MathJax.js-locally.patch
+++ b/debian/patches/0002-Retrieve-MathJax.js-locally.patch
@@ -6,8 +6,6 @@ Subject: Retrieve MathJax.js locally
  docs/conf.py | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/docs/conf.py b/docs/conf.py
-index fe3b911..0fc0781 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
 @@ -39,6 +39,8 @@ extensions = [
diff --git a/debian/patches/0003-Do-not-install-.pxi-file.patch b/debian/patches/0003-Do-not-install-.pxi-file.patch
index 15cf9ee..35761e1 100644
--- a/debian/patches/0003-Do-not-install-.pxi-file.patch
+++ b/debian/patches/0003-Do-not-install-.pxi-file.patch
@@ -8,17 +8,13 @@ shapely, and it makes the Python 2 and 3 versions clash.
  setup.py | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index 9748470..7529165 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -85,8 +85,7 @@ setup_args = dict(
-         'Programming Language :: Python :: 2.7',
+@@ -120,7 +120,6 @@ setup_args = dict(
          'Programming Language :: Python :: 3',
          'Topic :: Scientific/Engineering :: GIS',
--    ],
--    data_files         = [('shapely', ['shapely/_geos.pxi'])]
-+    ]
+     ],
+-    data_files         = [('shapely', ['shapely/_geos.pxi'])],
+     cmdclass           = {},
  )
  
- # Add DLLs for Windows
diff --git a/debian/patches/0004-Remove-externally-referenced-image.patch b/debian/patches/0004-Remove-externally-referenced-image.patch
index 710f05b..5fdb1f7 100644
--- a/debian/patches/0004-Remove-externally-referenced-image.patch
+++ b/debian/patches/0004-Remove-externally-referenced-image.patch
@@ -7,8 +7,6 @@ Fixes lintian privacy-breach-generic
  README.rst | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/README.rst b/README.rst
-index ea892c0..d557791 100644
 --- a/README.rst
 +++ b/README.rst
 @@ -4,8 +4,7 @@ Shapely

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