[python-shapely] 07/08: Refresh patches.

Bas Couwenberg sebastic at debian.org
Wed Sep 14 17:25:44 UTC 2016


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

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

commit cd243c5293dd57382a5aca5848c01053ffc775ed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 14 19:11:36 2016 +0200

    Refresh patches.
---
 debian/changelog                                     |  1 +
 .../patches/0001-setup.cfg-to-autobuild-sphinx.patch |  7 +++++--
 debian/patches/0003-Do-not-install-.pxi-file.patch   | 20 --------------------
 .../0004-Remove-externally-referenced-image.patch    |  4 ++--
 debian/patches/series                                |  1 -
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16f83ea..8338f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ python-shapely (1.6~a1-1) UNRELEASED; urgency=medium
   * Add citation reference to upstream metadata.
   * Update copyright file, changes:
     - Add license & copyright for packaging/*
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 14 Sep 2016 18:17:53 +0200
 
diff --git a/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch b/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
index 8c3595a..64b65ce 100644
--- a/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
+++ b/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
@@ -7,9 +7,12 @@ Subject: setup.cfg to autobuild sphinx
  1 file changed, 4 insertions(+)
  create mode 100644 setup.cfg
 
---- /dev/null
+--- a/setup.cfg
 +++ b/setup.cfg
-@@ -0,0 +1,4 @@
+@@ -1,2 +1,7 @@
+ [pytest]
+ testpaths = tests
++
 +[build_sphinx]
 +source-dir = docs
 +build-dir  = build/sphinx
diff --git a/debian/patches/0003-Do-not-install-.pxi-file.patch b/debian/patches/0003-Do-not-install-.pxi-file.patch
deleted file mode 100644
index 35761e1..0000000
--- a/debian/patches/0003-Do-not-install-.pxi-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Mon, 29 Sep 2014 08:48:38 +0200
-Subject: Do not install .pxi file
-
-This file is apparently not required for the (post-install) functioning of
-shapely, and it makes the Python 2 and 3 versions clash.
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -120,7 +120,6 @@ setup_args = dict(
-         'Programming Language :: Python :: 3',
-         'Topic :: Scientific/Engineering :: GIS',
-     ],
--    data_files         = [('shapely', ['shapely/_geos.pxi'])],
-     cmdclass           = {},
- )
- 
diff --git a/debian/patches/0004-Remove-externally-referenced-image.patch b/debian/patches/0004-Remove-externally-referenced-image.patch
index 5fdb1f7..3ebd309 100644
--- a/debian/patches/0004-Remove-externally-referenced-image.patch
+++ b/debian/patches/0004-Remove-externally-referenced-image.patch
@@ -17,5 +17,5 @@ Fixes lintian privacy-breach-generic
 -   :target: https://travis-ci.org/Toblerity/Shapely
 +.. `TRAVIS CI https://travis-ci.org/Toblerity/Shapely`
  
- .. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
-    :width: 800
+ .. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
+    :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
diff --git a/debian/patches/series b/debian/patches/series
index 6b0acae..dea9e5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-setup.cfg-to-autobuild-sphinx.patch
 0002-Retrieve-MathJax.js-locally.patch
-0003-Do-not-install-.pxi-file.patch
 0004-Remove-externally-referenced-image.patch

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



More information about the Pkg-grass-devel mailing list