[renpy] 142/146: Rebase 01_abspaths.patch

[Markus Koschany]

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

apo-guest pushed a commit to branch experimental
in repository renpy.

commit bb3acc2b893d815f0b00183933287b29686c85ac
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jan 12 17:52:04 2016 +0100

    Rebase 01_abspaths.patch
---
 .../patches/{01_abspaths.patch => 01_abspath.patch}   | 19 +++++++++----------
 debian/patches/series                                 |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/patches/01_abspaths.patch b/debian/patches/01_abspath.patch
similarity index 62%
rename from debian/patches/01_abspaths.patch
rename to debian/patches/01_abspath.patch
index 1b2fd99..601b05a 100644
--- a/debian/patches/01_abspaths.patch
+++ b/debian/patches/01_abspath.patch
@@ -1,8 +1,6 @@
-Index: renpy-6.17.6-source/renpy.py
-===================================================================
---- renpy-6.17.6-source.orig/renpy.py
-+++ renpy-6.17.6-source/renpy.py
-@@ -59,6 +59,12 @@ def path_to_saves(gamedir):
+--- a/renpy.py
++++ b/renpy.py
+@@ -74,6 +74,13 @@ def path_to_saves(gamedir, save_director
  
          return rv
  
@@ -12,15 +10,16 @@ Index: renpy-6.17.6-source/renpy.py
 +        if gamename.endswith("/game") or gamename.endswith("/data"):
 +            gamename = gamename[:-5]
 +        return os.path.expanduser("~/.renpy/") + gamename + "/saves"
- 
-     # No save directory given.
-     if not renpy.config.save_directory:
-@@ -97,7 +103,7 @@ def path_to_saves(gamedir):
++
+     if renpy.ios:
+         from pyobjus import autoclass
+         from pyobjus.objc_py_types import enum
+@@ -134,7 +141,7 @@ def path_to_saves(gamedir, save_director
  # Returns the path to the Ren'Py base directory (containing common and
  # the launcher, usually.)
  def path_to_renpy_base():
 -    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
 +    renpy_base = "/usr/share/games/renpy"
-     renpy_base = os.environ.get('RENPY_BASE', renpy_base)
      renpy_base = os.path.abspath(renpy_base)
  
+     return renpy_base
diff --git a/debian/patches/series b/debian/patches/series
index bfece96..01b45a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01_abspaths.patch
+01_abspath.patch
 02_traceback.patch
 03_checkdir.patch
 04_typo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/renpy.git