This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository python-sfml.
commit ac91be2422bd2a4138182437fbcb2d9e91718cea Author: James Cowgill <[email protected]> Date: Mon Jun 29 00:46:49 2015 +0100 Refresh patches + drop patches applied upstream Applied upstream: - 01_spelling-length.patch - 04_Fixed-sf.Rectangle.interesects-method.patch - 05_Fix-documentation-errors-causing-build-failures-with.patch Simplify and refresh 02_disable-cython-headers.patch. --- debian/patches/01_spelling-length.patch | 27 --- debian/patches/02_disable-cython-headers.patch | 67 +------ .../04_Fixed-sf.Rectangle.interesects-method.patch | 25 --- ...tation-errors-causing-build-failures-with.patch | 218 --------------------- debian/patches/series | 3 - 5 files changed, 8 insertions(+), 332 deletions(-) diff --git a/debian/patches/01_spelling-length.patch b/debian/patches/01_spelling-length.patch deleted file mode 100644 index 20d55a6..0000000 --- a/debian/patches/01_spelling-length.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix a spelling error for lintian -Author: James Cowgill <[email protected]> -Bug: https://github.com/Sonkun/python-sfml/pull/90 -Applied-Upstream: https://github.com/Sonkun/python-sfml/commit/9184895efbc8a47ce51453ca8e3485dfa9ef659c -Last-Update: 2013-10-28 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/sfml/audio.pyx -+++ b/src/sfml/audio.pyx -@@ -46,7 +46,7 @@ - - cdef class Listener: - def __init__(self): -- NotImplementedError("This class is not meant to be instanciated!") -+ NotImplementedError("This class is not meant to be instantiated!") - - @classmethod - def get_global_volume(cls): -@@ -107,7 +110,7 @@ - cdef char* data = <bytes>bdata - - if len(bdata) % 2: -- raise ValueError("Chunk data lenght must be even as it represents a 16bit array") -+ raise ValueError("Chunk data length must be even as it represents a 16bit array") - - if self.delete_this: - free(self.m_samples) diff --git a/debian/patches/02_disable-cython-headers.patch b/debian/patches/02_disable-cython-headers.patch index fbc0121..b48dd4d 100644 --- a/debian/patches/02_disable-cython-headers.patch +++ b/debian/patches/02_disable-cython-headers.patch @@ -1,65 +1,14 @@ Description: Do not distribute Cython and C headers - This is a temporary fix to prevent the installer spewing out - the Cython and C header files which seem to cause lots of - warnings and I don't really understand where they should go. Author: James Cowgill <[email protected]> -Last-Update: 2013-10-27 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/setup.py +++ b/setup.py -@@ -115,46 +115,6 @@ - [sources['network']], - ['sfml-system', 'sfml-network']) - -- --major, minor, _, _ , _ = sys.version_info -- --# Distribute Cython API (install cython headers) --# Path: {CYTHON_DIR}/Includes/libcpp/sfml.pxd --import cython --cython_path = os.path.join(os.path.dirname(cython.__file__),'Cython') -- --cython_headers = [] -- --pxd_files = glob(os.path.join('include', 'libcpp', '*')) --pxd_files.remove(os.path.join('include', 'libcpp', 'http')) --pxd_files.remove(os.path.join('include', 'libcpp', 'ftp')) --cython_headers.append((os.path.join(cython_path, 'Includes', 'libcpp'), pxd_files)) -- --pxd_files = glob(os.path.join('include', 'libcpp', 'http', '*')) --cython_headers.append((os.path.join(cython_path, 'Includes', 'libcpp', 'http'), pxd_files)) -- --pxd_files = glob(os.path.join('include', 'libcpp', 'ftp', '*')) --cython_headers.append((os.path.join(cython_path, 'Includes', 'libcpp', 'ftp'), pxd_files)) -- --# Distribute C API (install C headers) -- --if platform.system() == 'Windows': -- # On Windows: C:\Python27\include\pysfml\*_api.h -- c_api = [(sys.prefix +'\\include\\pysfml', glob('include/pysfml/*.h'))] --else: -- # On Unix: /usr/include/pysfml/*_api.h -- c_api = [('/usr/include/pysfml', glob('include/pysfml/*.h'))] -- --# Install the Cython API --if platform.system() == 'Windows': -- # On Windows: C:\Python27\Lib\pysfml\*.pxd -- cython_api = [(sys.prefix + '\\Lib\\pysfml', glob('include/pysfml/*.pxd'))] --else: -- # On Unix: /usr/lib/pythonX.Y/pysfml/*.pxd -- cython_api = [('/usr/lib/python{0}.{1}/pysfml'.format(major, minor), glob('include/pysfml/*.pxd'))] -- --files = cython_headers + c_api + cython_api -- - with open('README.rst', 'r') as f: - long_description = f.read() - -@@ -165,7 +125,6 @@ - ext_modules=ext_modules, - package_dir={'': 'src'}, - packages=['sfml'], -- data_files=files, - version='1.3.0', - description='Python bindings for SFML', - long_description=long_description, +@@ -168,7 +168,6 @@ kwargs = dict( + ext_modules=ext_modules, + package_dir={'': 'src'}, + packages=['sfml'], +- data_files=files, + version='2.2.0', + description='Python bindings for SFML', + long_description=long_description, diff --git a/debian/patches/04_Fixed-sf.Rectangle.interesects-method.patch b/debian/patches/04_Fixed-sf.Rectangle.interesects-method.patch deleted file mode 100644 index 64681db..0000000 --- a/debian/patches/04_Fixed-sf.Rectangle.interesects-method.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4fdd5c5c3e9ca9f0a3c0852910c50dfc5370649c Mon Sep 17 00:00:00 2001 -From: Jonathan De Wachter <[email protected]> -Date: Sat, 25 May 2013 16:12:54 +0200 -Subject: [PATCH 1/4] Fixed sf.Rectangle.interesects() method - ---- - src/sfml/graphics.pyx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sfml/graphics.pyx b/src/sfml/graphics.pyx -index 51e897c..68acb16 100644 ---- a/src/sfml/graphics.pyx -+++ b/src/sfml/graphics.pyx -@@ -185,7 +185,7 @@ cdef public class Rectangle [type PyRectangleType, object PyRectangleObject]: - def intersects(self, rectangle): - # make sure the rectangle is a rectangle (to get its right/bottom border) - l, t, w, h = rectangle -- rectangle = Rectangle(l, t, w, h) -+ rectangle = Rectangle((l, t), (w, h)) - - # compute the intersection boundaries - left = max(self.left, rectangle.left) --- -2.1.4 - diff --git a/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch b/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch deleted file mode 100644 index 32b6b86..0000000 --- a/debian/patches/05_Fix-documentation-errors-causing-build-failures-with.patch +++ /dev/null @@ -1,218 +0,0 @@ -Description: Fix documentation errors causing build failures with sphinx 1.3 - Note the forwarded version has a few more changes in it to fix mistakes - introduced since python-sfml 1.3 -Author: James Cowgill <[email protected]> -Bug-Debian: https://bugs.debian.org/787855 -Forwarded: https://github.com/Sonkun/python-sfml/pull/114 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/doc/source/api/graphics.rst -+++ b/doc/source/api/graphics.rst -@@ -541,7 +541,7 @@ Image - jpeg. If this function fails, it raises an exception. - - :raise: :exc:`IOError` - The image failed to load -- :param string filename: Path of the image file to load -+ :param str filename: Path of the image file to load - :rtype: :class:`sfml.graphics.Image` - - .. py:classmethod:: from_memory(data) -@@ -565,7 +565,7 @@ Image - The destination file is overwritten if it already exists. - - :raise: :exc:`IOError` - If the image is empty -- :param string filename: Path of the file to save -+ :param str filename: Path of the file to save - - .. py:method:: show() - -@@ -794,7 +794,7 @@ Texture - If this function fails, it raises an exception. - - :raise: :class:`IOError` - The texture failed to load -- :param string filename: Path of the image file to load -+ :param str filename: Path of the image file to load - :param area: Area of the image to load - :type area: :class:`sfml.graphics.Rectangle` - :rtype: :class:`sfml.graphics.Texture` -@@ -1123,7 +1123,7 @@ Font - This function raises an exception if it fails. - - :raise: :exc:`IOError` - The font failed to load -- :param string filename: Path of the font file to load -+ :param str filename: Path of the font file to load - :rtype: :class:`sfml.graphics.Font` - - .. py:classmethod:: from_memory(data) -@@ -1254,8 +1254,8 @@ Shader - writing your own shaders. - - :raise: :exc:`IOError` - If one of the two shaders failed to load -- :param string vertex_filename: Path of the vertex or fragment shader file to load -- :param string fragment_filename: Path of the fragment shader file to load -+ :param str vertex_filename: Path of the vertex or fragment shader file to load -+ :param str fragment_filename: Path of the fragment shader file to load - :rtype: :class:`sfml.graphics.Shader` - - -@@ -1272,8 +1272,8 @@ Shader - shaders. - - :raise: :exc:`IOError` - If one of the two shaders failed to load -- :param string vertex_shader: String containing the source code of the vertex shader -- :param string fragment_shader: String containing the source code of the fragment shader -+ :param str vertex_shader: String containing the source code of the vertex shader -+ :param str fragment_shader: String containing the source code of the fragment shader - :rtype: :class:`sfml.graphics.Shader` - - .. py:method:: set_parameter(*args, **kwargs) -@@ -1324,8 +1324,8 @@ Shader - shader.set_1float_parameter("myparam", 5.2) # using the specific method (faster) - shader.set_parameter("myparam", 5.2) # using the general method - -- :param string name: Name of the parameter in the shader -- :param x float: Value to assign -+ :param str name: Name of the parameter in the shader -+ :param float x: Value to assign - - .. py:method:: set_2float_parameter(name, x, y) - -@@ -1344,9 +1344,9 @@ Shader - shader.set_2float_parameter("myparam", 5.2, 6) # using the specific method (faster) - shader.set_parameter("myparam", 5.2, 6) # using the general method - -- :param string name: Name of the parameter in the shader -- :param x float: First component of the value to assign -- :param y float: Second component of the value to assign -+ :param str name: Name of the parameter in the shader -+ :param float x: First component of the value to assign -+ :param float y: Second component of the value to assign - - .. py:method:: set_3float_parameter(name, x, y, z) - -@@ -1365,10 +1365,10 @@ Shader - shader.set_3float_parameter("myparam", 5.2, 6, -8.1) # using the specific method (faster) - shader.set_parameter("myparam", 5.2, 6, -8.1) # using the general method - -- :param string name: Name of the parameter in the shader -- :param x float: First component of the value to assign -- :param y float: Second component of the value to assign -- :param z float: Third component of the value to assign -+ :param str name: Name of the parameter in the shader -+ :param float x: First component of the value to assign -+ :param float y: Second component of the value to assign -+ :param float z: Third component of the value to assign - - .. py:method:: set_4float_parameter(name, x, y, z, w) - -@@ -1387,11 +1387,11 @@ Shader - shader.set_4float_parameter("myparam", 5.2, 6, -8.1, 0.4) # using the specific method (faster) - shader.set_parameter("myparam", 5.2, 6, -8.1, 0.4) # using the general method - -- :param string name: Name of the parameter in the shader -- :param x float: First component of the value to assign -- :param y float: Second component of the value to assign -- :param z float: Third component of the value to assign -- :param w float: Fourth component of the value to assign -+ :param str name: Name of the parameter in the shader -+ :param float x: First component of the value to assign -+ :param float y: Second component of the value to assign -+ :param float z: Third component of the value to assign -+ :param float w: Fourth component of the value to assign - - .. py:method:: set_vector2_paramater(name, vector) - -@@ -1412,7 +1412,7 @@ Shader - shader.set_parameter("myparam", sf.Vector2(5.2, 6)) # using the general method - shader.set_parameter("myparam", (5.2, 6)) # using tuple works too - -- :param string name: Name of the parameter in the shader -+ :param str name: Name of the parameter in the shader - :param sfml.system.Vector2 vector: Vector to assign - - .. py:method:: set_vector3_paramater(name, vector) -@@ -1433,7 +1433,7 @@ Shader - shader.set_parameter("myparam", sf.Vector3(5.2, 6, -8.1)) # using the general method - shader.set_parameter("myparam", (5.2, 6, -8.1)) # using tuple works too - -- :param string name: Name of the parameter in the shader -+ :param str name: Name of the parameter in the shader - :param sfml.system.Vector3 vector: Vector to assign - - .. py:method:: set_color_parameter(name, color) -@@ -1459,7 +1459,7 @@ Shader - shader.set_color_parameter("myparam", sf.Color(255, 128, 0, 255)) # using the specific method (faster) - shader.set_parameter("myparam", sf.Color(255, 128, 0, 255)) # using the general method - -- :param string name: Name of the parameter in the shader -+ :param str name: Name of the parameter in the shader - :param sfml.graphics.Color color: Color to assign - - .. py:method:: set_transform_parameter(name, transform) -@@ -1482,7 +1482,7 @@ Shader - shader.set_transform_parameter("matrix", transform) # using the specific method (faster) - shader.set_parameter("matrix", transform) # using the general method - -- :param string name: Name of the parameter in the shader -+ :param str name: Name of the parameter in the shader - :param sfml.graphics.Transform transform: Transform to assign - - .. py:method:: set_texture_parameter(name, texture) -@@ -1511,7 +1511,7 @@ Shader - To use the texture of the object being draw, which cannot be - known in advance, use :meth:`set_currenttexturetype_parameter`. - -- :param string name: Name of the parameter in the shader -+ :param str name: Name of the parameter in the shader - :param sfml.graphics.Texture texture: Texture to assign - - .. py:method:: set_currenttexturetype_parameter(name) -@@ -1994,7 +1994,7 @@ Text - - Construct the string, and optionally from a string, font and size. - -- :param string: Text assigned to the string -+ :param str: Text assigned to the string - :type string: bytes or string - :param sfml.graphics.Font font: Font used to draw the string - :param integer character_size: Base size of characters, in pixels -@@ -2908,7 +2908,7 @@ RenderWindow - usage of the graphics module. - - :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window) -- :param string title: Title of the window -+ :param str title: Title of the window - :param style: Window style - :type style: :class:`sfml.window.Style`'s constant - :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context ---- a/doc/source/api/network.rst -+++ b/doc/source/api/network.rst -@@ -54,7 +54,7 @@ IpAddress - Here address can be either a decimal address (ex: "192.168.1.56") - or a network name (ex: "localhost"). - -- :param string string: IP address or network name -+ :param str string: IP address or network name - :rtype: :class:`sfml.network.IpAddress` - - .. classmethod:: from_integer(integer) ---- a/doc/source/api/window.rst -+++ b/doc/source/api/window.rst -@@ -492,7 +492,7 @@ Window - etc. - - :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window) -- :param string title: Title of the window -+ :param str title: Title of the window - :param sfml.window.Style style: Window style - :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context - -@@ -501,7 +501,7 @@ Window - Recreate the window. - - :param sfml.window.VideoMode mode: Video mode to use (defines the width, height and depth of the rendering area of the window) -- :param string title: Title of the window -+ :param str title: Title of the window - :param sfml.window.Style style: Window style - :param sfml.window.ContextSettings settings: Additional settings for the underlying OpenGL context - diff --git a/debian/patches/series b/debian/patches/series index 64d4a4f..0beb523 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -01_spelling-length.patch 02_disable-cython-headers.patch 03_disable-intersphinx.patch -04_Fixed-sf.Rectangle.interesects-method.patch -05_Fix-documentation-errors-causing-build-failures-with.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/python-sfml.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
