This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository fiona.
commit 54f4aa6af9518f512e55f50c6efc3633d2f78e02 Author: Bas Couwenberg <[email protected]> Date: Wed Jun 15 17:52:36 2016 +0200 Drop clean-setup.patch, fixed upstream. Refresh remaining patches. --- debian/changelog | 1 + ...-fio-command-to-fiona-to-avoid-name-clash.patch | 2 +- .../0006-Remove-unknown-distribution-options.patch | 2 +- debian/patches/clean-setup.patch | 23 ---------------------- debian/patches/series | 1 - 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index dced8bb..67683f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ fiona (1.7.0.post1-1) UNRELEASED; urgency=medium * Team upload. * New upstream post release. + * Drop clean-setup.patch, fixed upstream. Refresh remaining patches. -- Bas Couwenberg <[email protected]> Wed, 15 Jun 2016 17:51:11 +0200 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 9545c6a..dac268a 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 -@@ -234,7 +234,7 @@ setup_args = dict( +@@ -226,7 +226,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 285cd80..b4d2e31 100644 --- a/debian/patches/0006-Remove-unknown-distribution-options.patch +++ b/debian/patches/0006-Remove-unknown-distribution-options.patch @@ -6,7 +6,7 @@ Author: Bas Couwenberg <[email protected]> --- a/setup.py +++ b/setup.py -@@ -216,11 +216,8 @@ if sys.version_info < (2, 7): +@@ -208,11 +208,8 @@ if sys.version_info < (2, 7): setup_args = dict( cmdclass={'sdist': sdist_multi_gdal}, diff --git a/debian/patches/clean-setup.patch b/debian/patches/clean-setup.patch deleted file mode 100644 index 6103e09..0000000 --- a/debian/patches/clean-setup.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Don't copy GDAL API C files in clean target. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/Toblerity/Fiona/pull/361 - ---- a/setup.py -+++ b/setup.py -@@ -177,6 +177,7 @@ ext_options = dict( - extra_link_args=extra_link_args) - - # When building from a repo, Cython is required. -+ext_modules = [] - if source_is_repo and "clean" not in sys.argv: - log.info("MANIFEST.in found, presume a repo, cythonizing...") - if not cythonize: -@@ -194,7 +195,7 @@ if source_is_repo and "clean" not in sys - Extension('fiona._err', ['fiona/_err.pyx'], **ext_options), - Extension('fiona.ogrext', ['fiona/ogrext.pyx'], **ext_options)]) - # If there's no manifest template, as in an sdist, we just specify .c files. --else: -+elif "clean" not in sys.argv: - copy_gdalapi_c(gdalversion) - ext_modules = [ - Extension('fiona._transform', ['fiona/_transform.cpp'], **ext_options), diff --git a/debian/patches/series b/debian/patches/series index 56dbaa8..780dd7b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch 0002-Remove-outside-reference-possible-privacy-breach.patch 0006-Remove-unknown-distribution-options.patch -clean-setup.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
