[fiona] 04/05: 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 fiona.

commit f6c9bd4bd28b5a85550e7e78c679a54c16cd7a09
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 15 00:22:47 2016 +0200

    Refresh patches.
---
 .../0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch        | 2 +-
 debian/patches/0006-Remove-unknown-distribution-options.patch         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch b/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
index f00002b..9545c6a 100644
--- a/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
+++ b/debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
@@ -9,7 +9,7 @@ There is already another package providing a binary "fio" (fio).
 
 --- a/setup.py
 +++ b/setup.py
-@@ -198,7 +198,7 @@ setup_args = dict(
+@@ -234,7 +234,7 @@ setup_args = dict(
      packages=['fiona', 'fiona.fio'],
      entry_points='''
          [console_scripts]
diff --git a/debian/patches/0006-Remove-unknown-distribution-options.patch b/debian/patches/0006-Remove-unknown-distribution-options.patch
index fd1a019..285cd80 100644
--- a/debian/patches/0006-Remove-unknown-distribution-options.patch
+++ b/debian/patches/0006-Remove-unknown-distribution-options.patch
@@ -6,10 +6,10 @@ Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/setup.py
 +++ b/setup.py
-@@ -180,11 +180,8 @@ if sys.version_info < (2, 7):
-     requirements.append('ordereddict')
+@@ -216,11 +216,8 @@ if sys.version_info < (2, 7):
  
  setup_args = dict(
+     cmdclass={'sdist': sdist_multi_gdal},
 -    metadata_version='1.2',
      name='Fiona',
      version=version,

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