[Python-modules-commits] r32528 - in packages/kivy/trunk (17 files)
vcheng at users.alioth.debian.org
vcheng at users.alioth.debian.org
Sat May 2 08:23:47 UTC 2015
Date: Saturday, May 2, 2015 @ 08:23:46
Author: vcheng
Revision: 32528
[svn-inject] Applying Debian modifications (1.8.0+dfsg-2.1) to trunk
Added:
packages/kivy/trunk/debian/
packages/kivy/trunk/debian/changelog
packages/kivy/trunk/debian/compat
packages/kivy/trunk/debian/control
packages/kivy/trunk/debian/copyright
packages/kivy/trunk/debian/docs
packages/kivy/trunk/debian/kivy-doc.docs
packages/kivy/trunk/debian/patches/
packages/kivy/trunk/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
packages/kivy/trunk/debian/patches/0001-Fixes-for-Cython-0.21.patch
packages/kivy/trunk/debian/patches/series
packages/kivy/trunk/debian/python-kivy-examples.install
packages/kivy/trunk/debian/python-kivy.install
packages/kivy/trunk/debian/python3-kivy.install
packages/kivy/trunk/debian/rules
packages/kivy/trunk/debian/source/
packages/kivy/trunk/debian/source/format
Property changes on: packages/kivy/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/kivy/trunk/debian/changelog
===================================================================
--- packages/kivy/trunk/debian/changelog (rev 0)
+++ packages/kivy/trunk/debian/changelog 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,36 @@
+kivy (1.8.0+dfsg-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fixing FTBFS against cythoin 0.21.1 by cherry-picking upstream fix
+ debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
+ (Closes: #768828)
+
+ -- Yaroslav Halchenko <debian at onerussian.com> Sun, 09 Nov 2014 10:11:22 -0500
+
+kivy (1.8.0+dfsg-2) unstable; urgency=medium
+
+ * Provide python3-kivy package. The patch for that was provided by Vincent
+ Cheng, thank you Vincent! (Closes: #740304)
+ * Bumped standards version (no changes).
+
+ -- Bastian Venthur <venthur at debian.org> Fri, 28 Feb 2014 09:25:51 +0100
+
+kivy (1.8.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #737351)
+ * Removed patch for Makefile which prevented `git cleanup` to remove the
+ debian subdirectory. The patch was applied upstream
+ * Fix "[src:kivy] Sourceless file" replaced file with concatenation of
+ jquery.effects.core and -slide (Closes: #736734)
+ * Fix "kivy is MIT, not LGPL" fixed wording in debian/control (Closes:
+ #739036)
+ * Fix "kivy-examples: Examples shoule be installed in /usr/share/kivy-
+ examples, NOT 'kivi-examples'" (Closes: #735374)
+
+ -- Bastian Venthur <venthur at debian.org> Wed, 26 Feb 2014 17:31:34 +0100
+
+kivy (1.7.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #725163)
+
+ -- Bastian Venthur <venthur at debian.org> Wed, 02 Oct 2013 09:21:46 +0200
Added: packages/kivy/trunk/debian/compat
===================================================================
--- packages/kivy/trunk/debian/compat (rev 0)
+++ packages/kivy/trunk/debian/compat 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+8
Added: packages/kivy/trunk/debian/control
===================================================================
--- packages/kivy/trunk/debian/control (rev 0)
+++ packages/kivy/trunk/debian/control 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,57 @@
+Source: kivy
+Section: python
+Priority: extra
+Maintainer: Bastian Venthur <venthur at debian.org>
+Build-Depends: debhelper (>= 8.0.0),
+ python (>= 2.7), python-all-dev (>= 2.7),
+ cython, cython3,
+ libgl1-mesa-dev, libgles2-mesa-dev,
+ python3-all-dev, dh-python
+Standards-Version: 3.9.5
+Homepage: http://kivy.org
+Vcs-Git: http://github.com/kivy/kivy.git
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+
+Package: python-kivy
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ python-pygame,
+ python-gst0.10
+Description: Kivy - Multimedia / Multitouch framework in Python (Python 2)
+ Kivy is an open source library for developing multi-touch applications. It is
+ completely cross platform (Linux/OSX/Win/Android) and released under the terms
+ of the MIT license.
+ .
+ It comes with native support for many multi-touch input devices, a growing
+ library of multi-touch aware widgets, hardware accelerated OpenGL drawing, and
+ an architecture that is designed to let you focus on building custom and highly
+ interactive applications as quickly and easily as possible.
+ .
+ Kivy is a mixed Python library with Cython code, to take advantage of its
+ highly dynamic nature and use any of the thousands of high quality and open
+ source python libraries out there, with the speed of C code.
+
+Package: python3-kivy
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Description: Kivy - Multimedia / Multitouch framework in Python (Python 3)
+ Kivy is an open source library for developing multi-touch applications. It is
+ completely cross platform (Linux/OSX/Win/Android) and released under the terms
+ of the MIT license.
+ .
+ It comes with native support for many multi-touch input devices, a growing
+ library of multi-touch aware widgets, hardware accelerated OpenGL drawing, and
+ an architecture that is designed to let you focus on building custom and highly
+ interactive applications as quickly and easily as possible.
+ .
+ Kivy is a mixed Python library with Cython code, to take advantage of its
+ highly dynamic nature and use any of the thousands of high quality and open
+ source python libraries out there, with the speed of C code.
+
+Package: python-kivy-examples
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-kivy
+Description: Kivy - Example files
+ This package includes all examples which can be found in the git repository.
+
Added: packages/kivy/trunk/debian/copyright
===================================================================
--- packages/kivy/trunk/debian/copyright (rev 0)
+++ packages/kivy/trunk/debian/copyright 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,45 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kivy
+Source: http://kivy.org
+
+Files: *
+Copyright: 2010-2013 Kivy Team and other contributors
+License: MIT
+
+Files: data/fonts/DejaVu*
+Copyright: 2003 Bitstream, Inc
+License: public-domain
+
+Files: data/fonts/Doid*
+Copyright: 2006-2010 Google Corp.
+License: apache
+
+Files: debian/*
+Copyright: 2013 Bastian Venthur <venthur at debian.org>
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: apache
+ /usr/share/common-licenses/Apache-2.0
+
+License: public-domain
+ The DejaVuSans.ttf is placed in the public domain.
+
Added: packages/kivy/trunk/debian/docs
===================================================================
--- packages/kivy/trunk/debian/docs (rev 0)
+++ packages/kivy/trunk/debian/docs 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+README.md
Added: packages/kivy/trunk/debian/kivy-doc.docs
===================================================================
--- packages/kivy/trunk/debian/kivy-doc.docs (rev 0)
+++ packages/kivy/trunk/debian/kivy-doc.docs 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+#DOCS#
Added: packages/kivy/trunk/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch
===================================================================
--- packages/kivy/trunk/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch (rev 0)
+++ packages/kivy/trunk/debian/patches/0001-Fix-cython-python-temp-coercion-exception.patch 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,34 @@
+From 827bd6c7b7d04ec72cb3bdbf0ffcd90630d90008 Mon Sep 17 00:00:00 2001
+From: Matthew Einhorn <moiein2000 at gmail.com>
+Date: Thu, 17 Jul 2014 16:37:42 -0400
+Subject: [PATCH] Fix cython 'python temp coercion' exception.
+
+---
+ kivy/graphics/shader.pyx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kivy/graphics/shader.pyx b/kivy/graphics/shader.pyx
+index eab0f42..39c449a 100644
+--- a/kivy/graphics/shader.pyx
++++ b/kivy/graphics/shader.pyx
+@@ -421,6 +421,7 @@ cdef class Shader:
+ cdef void bind_vertex_format(self, VertexFormat vertex_format):
+ cdef unsigned int i
+ cdef vertex_attr_t *attr
++ cdef bytes name
+
+ # if the current vertex format used in the shader is the current one, do
+ # nothing.
+@@ -445,7 +446,8 @@ cdef class Shader:
+ attr = &vertex_format.vattr[i]
+ if attr.per_vertex == 0:
+ continue
+- attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name)
++ name = <bytes>attr.name
++ attr.index = glGetAttribLocation(self.program, <char *>name)
+ glEnableVertexAttribArray(attr.index)
+
+ # save for the next run.
+--
+2.1.1
+
Added: packages/kivy/trunk/debian/patches/0001-Fixes-for-Cython-0.21.patch
===================================================================
--- packages/kivy/trunk/debian/patches/0001-Fixes-for-Cython-0.21.patch (rev 0)
+++ packages/kivy/trunk/debian/patches/0001-Fixes-for-Cython-0.21.patch 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,36 @@
+From 90ddebab3f56c06175dd99b153383990434b9514 Mon Sep 17 00:00:00 2001
+From: Mathieu Virbel <mat at kivy.org>
+Date: Tue, 16 Sep 2014 10:11:23 +0200
+Subject: [PATCH] Fixes for Cython 0.21
+
+---
+ kivy/lib/gstplayer/_gstplayer.pyx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/kivy/lib/gstplayer/_gstplayer.pyx b/kivy/lib/gstplayer/_gstplayer.pyx
+index f07af0b..aa29c11 100644
+--- a/kivy/lib/gstplayer/_gstplayer.pyx
++++ b/kivy/lib/gstplayer/_gstplayer.pyx
+@@ -207,7 +207,7 @@ cdef class GstPlayer:
+ self.eos_cb()
+
+ def load(self):
+- cdef char *c_uri
++ cdef bytes py_uri
+
+ # if already loaded before, clean everything.
+ if self.pipeline != NULL:
+@@ -256,8 +256,8 @@ cdef class GstPlayer:
+
+ # configure playbin
+ g_object_set_int(self.pipeline, 'async-handling', 1)
+- c_uri = <bytes>self.uri.encode('utf-8')
+- g_object_set_void(self.playbin, 'uri', c_uri)
++ py_uri = <bytes>self.uri.encode('utf-8')
++ g_object_set_void(self.playbin, 'uri', <char *>py_uri)
+
+ # attach the callback
+ # NOTE no need to create a weakref here, as we manage to grab/release
+--
+2.1.1
+
Added: packages/kivy/trunk/debian/patches/series
===================================================================
--- packages/kivy/trunk/debian/patches/series (rev 0)
+++ packages/kivy/trunk/debian/patches/series 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,2 @@
+0001-Fix-cython-python-temp-coercion-exception.patch
+0001-Fixes-for-Cython-0.21.patch
Added: packages/kivy/trunk/debian/python-kivy-examples.install
===================================================================
--- packages/kivy/trunk/debian/python-kivy-examples.install (rev 0)
+++ packages/kivy/trunk/debian/python-kivy-examples.install 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+examples/* usr/share/kivy-examples
Added: packages/kivy/trunk/debian/python-kivy.install
===================================================================
--- packages/kivy/trunk/debian/python-kivy.install (rev 0)
+++ packages/kivy/trunk/debian/python-kivy.install 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+usr/lib/python2*
Added: packages/kivy/trunk/debian/python3-kivy.install
===================================================================
--- packages/kivy/trunk/debian/python3-kivy.install (rev 0)
+++ packages/kivy/trunk/debian/python3-kivy.install 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+usr/lib/python3*
Added: packages/kivy/trunk/debian/rules
===================================================================
--- packages/kivy/trunk/debian/rules (rev 0)
+++ packages/kivy/trunk/debian/rules 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export PYBUILD_DESTDIR=debian/tmp
+
+%:
+ dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+ echo "Tests are currently disabled in debian/rules."
Property changes on: packages/kivy/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/kivy/trunk/debian/source/format
===================================================================
--- packages/kivy/trunk/debian/source/format (rev 0)
+++ packages/kivy/trunk/debian/source/format 2015-05-02 08:23:46 UTC (rev 32528)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list