This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository renpy.
commit f13caacae643bbe701a850a31b46af9f2deb0409 Author: Markus Koschany <[email protected]> Date: Sun Mar 13 20:44:19 2016 +0100 Add remove-PydevCodeAnalysisIgnore.patch --- debian/changelog | 3 +++ debian/patches/01_abspath.patch | 6 +++--- debian/patches/02_traceback.patch | 2 +- debian/patches/03_checkdir.patch | 4 ++-- debian/patches/remove-PydevCodeAnalysisIgnore.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab9be16..cf0d230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ renpy (6.99.9+dfsg-1) unstable; urgency=medium * Update debian/copyright for new release. * Override Lintian error source-is-missing because the js files are replaced by symlinks to Debian packages which contain the sources. + * Add remove-PydevCodeAnalysisIgnore.patch and remove + #@PydevCodeAnalysisIgnore from renpy.py because it causes a runtime error + and the game will not start. -- Markus Koschany <[email protected]> Sun, 13 Mar 2016 19:47:21 +0100 diff --git a/debian/patches/01_abspath.patch b/debian/patches/01_abspath.patch index 159c0a4..5117c3a 100644 --- a/debian/patches/01_abspath.patch +++ b/debian/patches/01_abspath.patch @@ -7,10 +7,10 @@ Subject: _abspath 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/renpy.py b/renpy.py -index 7548cf6..5bf3214 100644 +index 6d3f8b0..cb0ee21 100644 --- a/renpy.py +++ b/renpy.py -@@ -74,6 +74,13 @@ def path_to_saves(gamedir, save_directory=None): +@@ -73,6 +73,13 @@ def path_to_saves(gamedir, save_directory=None): return rv @@ -24,7 +24,7 @@ index 7548cf6..5bf3214 100644 if renpy.ios: from pyobjus import autoclass from pyobjus.objc_py_types import enum -@@ -134,7 +141,7 @@ def path_to_saves(gamedir, save_directory=None): +@@ -133,7 +140,7 @@ def path_to_saves(gamedir, save_directory=None): # Returns the path to the Ren'Py base directory (containing common and # the launcher, usually.) def path_to_renpy_base(): diff --git a/debian/patches/02_traceback.patch b/debian/patches/02_traceback.patch index 9416b61..5083589 100644 --- a/debian/patches/02_traceback.patch +++ b/debian/patches/02_traceback.patch @@ -8,7 +8,7 @@ Subject: _traceback 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/renpy/error.py b/renpy/error.py -index d70fe2a..07d34e0 100644 +index 0710a78..388c380 100644 --- a/renpy/error.py +++ b/renpy/error.py @@ -216,10 +216,24 @@ def report_exception(e, editor=True): diff --git a/debian/patches/03_checkdir.patch b/debian/patches/03_checkdir.patch index 465e569..e57928a 100644 --- a/debian/patches/03_checkdir.patch +++ b/debian/patches/03_checkdir.patch @@ -7,10 +7,10 @@ Subject: _checkdir 1 file changed, 4 insertions(+) diff --git a/renpy/main.py b/renpy/main.py -index f8bee19..f0e76a1 100644 +index 7121ecb..f5d06de 100644 --- a/renpy/main.py +++ b/renpy/main.py -@@ -253,6 +253,10 @@ def main(): +@@ -256,6 +256,10 @@ def main(): log_clock("Early init") diff --git a/debian/patches/remove-PydevCodeAnalysisIgnore.patch b/debian/patches/remove-PydevCodeAnalysisIgnore.patch new file mode 100644 index 0000000..db1bc4c --- /dev/null +++ b/debian/patches/remove-PydevCodeAnalysisIgnore.patch @@ -0,0 +1,20 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 13 Mar 2016 20:42:48 +0100 +Subject: remove PydevCodeAnalysisIgnore + +Remove #@PydevCodeAnalysisIgnore string from renpy.py because this causes a +runtime error and renpy will not start. +--- + renpy.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/renpy.py b/renpy.py +index cb0ee21..17ed86d 100644 +--- a/renpy.py ++++ b/renpy.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python #@PydevCodeAnalysisIgnore ++#!/usr/bin/python + + # This file is part of Ren'Py. The license below applies to Ren'Py only. + # Games and other projects that use Ren'Py may use a different license. diff --git a/debian/patches/series b/debian/patches/series index 0a30345..2c79c39 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_abspath.patch 02_traceback.patch 03_checkdir.patch +remove-PydevCodeAnalysisIgnore.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/renpy.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
