[python-fabio] 48/73: remove all patches

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-fabio.

commit 0033231969254194d41d11d1b094a8eea4ccc52f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Apr 5 09:35:47 2014 +0200

    remove all patches
---
 debian/changelog                                   |  8 ++-
 ...arded-upstream-cythonize-during-the-build.patch | 57 ----------------------
 debian/patches/0002-compat_2.5.patch               | 36 --------------
 debian/patches/series                              |  2 -
 4 files changed, 6 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09845c3..8ef1535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 python-fabio (0.1.4-1) UNRELEASED; urgency=medium
 
   * Imported Upstream version 0.1.4
-  * debian/watch
-    - use the sourceforge redirector
   * debian/copyright
     - updated with the 0.1.4 informations
+  * debian/patchs
+    - deleted (applyed by upstream)
+      - 0001-forwarded-upstream-cythonize-during-the-build.patch
+      - 0002-compat_2.5.patch
+  * debian/watch
+    - use the sourceforge redirector
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 05 Apr 2014 09:24:15 +0200
 
diff --git a/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch b/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch
deleted file mode 100644
index 97bd755..0000000
--- a/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Fri, 27 Dec 2013 19:45:08 +0100
-Subject: forwarded upstream cythonize during the build
-
----
- setup.py | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ebae18c..221123f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -13,21 +13,33 @@ except ImportError:
- from distutils.core import Extension, Command
- from numpy.distutils.misc_util import get_numpy_include_dirs
- 
-+# Check for Cython and use it if it is available
-+USE_CYTHON = False
-+try:
-+    from Cython.Build import cythonize
-+    USE_CYTHON = True
-+except ImportError:
-+    pass
- 
-+ext = ".pyx" if USE_CYTHON else ".c"
- 
- cf_backend = Extension('cf_io', include_dirs=get_numpy_include_dirs(),
-       sources=['src/cf_iomodule.c', 'src/columnfile.c'])
- 
- byteOffset_backend = Extension("byte_offset",
-                        include_dirs=get_numpy_include_dirs(),
--                           sources=['src/byte_offset.c'])
-+                               sources=['src/byte_offset' + ext])
- 
- mar345_backend = Extension('mar345_IO',
-                            include_dirs=get_numpy_include_dirs(),
--                           sources=['src/mar345_IO.c',
-+                           sources=['src/mar345_IO' + ext,
-                                     'src/ccp4_pack.c',
-                                       ])
- 
-+extensions = [cf_backend, byteOffset_backend, mar345_backend]
-+if USE_CYTHON:
-+    extensions = cythonize(extensions)
-+
- version = [eval(l.split("=")[1])
-            for l in open(op.join(op.dirname(op.abspath(__file__)), "fabio-src", "__init__.py"))
-            if l.strip().startswith("version")][0]
-@@ -87,7 +99,7 @@ setup(name='fabio',
-       url="http://fable.wiki.sourceforge.net/fabio",
-       download_url="http://sourceforge.net/projects/fable/files/fabio/0.1.2",
-       ext_package="fabio",
--      ext_modules=[mar345_backend, cf_backend, byteOffset_backend],
-+      ext_modules=extensions,
-       packages=["fabio"],
-       package_dir={"fabio": "fabio-src" },
-       test_suite="test",
diff --git a/debian/patches/0002-compat_2.5.patch b/debian/patches/0002-compat_2.5.patch
deleted file mode 100644
index 262e065..0000000
--- a/debian/patches/0002-compat_2.5.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
-Date: Fri, 27 Dec 2013 20:50:24 +0100
-Subject: compat_2.5
-
----
- fabio-src/binaryimage.py   | 2 +-
- fabio-src/templateimage.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fabio-src/binaryimage.py b/fabio-src/binaryimage.py
-index fdee49b..83b41b4 100644
---- a/fabio-src/binaryimage.py
-+++ b/fabio-src/binaryimage.py
-@@ -2,7 +2,7 @@
- # coding: utf8
- 
- # Get ready for python3:
--from __future__ import with_statement, print_function
-+from __future__ import with_statement
- __doc__ = """
- Authors: Gael Goret, Jerome Kieffer, ESRF, France
- Emails: gael.goret at esrf.fr, jerome.kieffer at esrf.fr
-diff --git a/fabio-src/templateimage.py b/fabio-src/templateimage.py
-index c6dda06..627e26b 100644
---- a/fabio-src/templateimage.py
-+++ b/fabio-src/templateimage.py
-@@ -34,7 +34,7 @@
- #    their data into another format
- 
- # Get ready for python3:
--from __future__ import with_statement, print_function
-+from __future__ import with_statement
- __doc__ = """
- Template for FabIO
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0b9c4fa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-forwarded-upstream-cythonize-during-the-build.patch
-0002-compat_2.5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git