[renpy] 78/146: New Upstream Release

[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 df43de235624ea85941466e5c6f71bcdd773daf7
Author: Miriam Ruiz <miriam at debian.org>
Date:   Thu Feb 10 23:16:00 2011 +0000

    New Upstream Release
---
 debian/changelog                     |  8 ++++++++
 debian/patches/00_module_setup.patch | 14 +++++++-------
 debian/patches/01_abspaths.patch     |  8 ++++----
 debian/patches/02_traceback.patch    | 12 ++++++------
 debian/patches/03_checkdir.patch     | 14 +++++++-------
 debian/patches/04_editor.patch       |  8 ++++----
 6 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8b0513..9b5f7a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+renpy (6.11.0-2) unstable; urgency=low
+
+  [ Miriam Ruiz ]
+  * New Upstream Release
+  * Refreshed patches
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 11 Feb 2011 00:14:54 +0100
+
 renpy (6.11.0-1) experimental; urgency=low
 
   [ Miriam Ruiz ]
diff --git a/debian/patches/00_module_setup.patch b/debian/patches/00_module_setup.patch
index d010151..2dc897d 100644
--- a/debian/patches/00_module_setup.patch
+++ b/debian/patches/00_module_setup.patch
@@ -1,11 +1,11 @@
---- a/module/setup.py
-+++ b/module/setup.py
-@@ -13,7 +13,7 @@ except:
- 
+--- renpy-6.12.0.orig/module/setup.py
++++ renpy-6.12.0/module/setup.py
+@@ -7,7 +7,7 @@
+ import subprocess
  
  # These control the level of optimization versus debugging.
--extra_compile_args = [ "-O3", "-funroll-loops" ]
-+extra_compile_args = [ "-O2", "-funroll-loops" ]
+-extra_compile_args = [ "-O3", "-Wno-unused-function" ]
++extra_compile_args = [ "-O2", "-Wno-unused-function" ]
+ # extra_compile_args = [ "-O3", "-funroll-loops", "-ggdb" ]
  # extra_compile_args = [ "-O0", "-ggdb" ]
  # extra_compile_args = [ "-O0", "-gstabs" ]
- 
diff --git a/debian/patches/01_abspaths.patch b/debian/patches/01_abspaths.patch
index 1b4f513..87f2341 100644
--- a/debian/patches/01_abspaths.patch
+++ b/debian/patches/01_abspaths.patch
@@ -1,6 +1,6 @@
---- a/renpy.py
-+++ b/renpy.py
-@@ -38,7 +38,14 @@ def path_to_common(renpy_base):
+--- renpy-6.12.0.orig/renpy.py
++++ renpy-6.12.0/renpy.py
+@@ -40,7 +40,14 @@
  # the path to a directory that will hold save files.
  def path_to_saves(gamedir):
      import renpy
@@ -16,7 +16,7 @@
      if not renpy.config.save_directory:
          return gamedir + "/saves"
  
-@@ -73,7 +80,7 @@ def path_to_saves(gamedir):
+@@ -80,7 +87,7 @@
  # 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 c39776a..ea05717 100644
--- a/debian/patches/02_traceback.patch
+++ b/debian/patches/02_traceback.patch
@@ -1,6 +1,6 @@
---- a/renpy/bootstrap.py
-+++ b/renpy/bootstrap.py
-@@ -356,10 +356,24 @@ def report_exception(e):
+--- renpy-6.12.0.orig/renpy/bootstrap.py
++++ renpy-6.12.0/renpy/bootstrap.py
+@@ -383,10 +383,24 @@
      print renpy.game.exception_info
      report_tb(sys.stdout, tb)
      
@@ -26,9 +26,9 @@
  
          f.write(codecs.BOM_UTF8)
  
-@@ -391,10 +405,18 @@ def report_exception(e):
-         f.close()
- 
+@@ -420,10 +434,18 @@
+         renpy.log.info_exception()
+         
          try:
 +            tbdir = renpy.config.savedir
 +            if tbdir[-1] == '/':
diff --git a/debian/patches/03_checkdir.patch b/debian/patches/03_checkdir.patch
index d88070c..83631fd 100644
--- a/debian/patches/03_checkdir.patch
+++ b/debian/patches/03_checkdir.patch
@@ -1,13 +1,13 @@
---- a/renpy/main.py
-+++ b/renpy/main.py
-@@ -126,6 +126,10 @@ def main():
-     # Init the config after load.
-     renpy.config.init()
- 
+--- renpy-6.12.0.orig/renpy/main.py
++++ renpy-6.12.0/renpy/main.py
+@@ -130,6 +130,10 @@
+     if "RENPY_VARIANT" in os.environ:
+         renpy.config.variants = list(os.environ["RENPY_VARIANT"].split(",")) + [ None ]
+     
 +    # Check if the game directory exists and is a directory
 +    if not os.path.isdir(renpy.config.gamedir):
 +        raise Exception("The game directory '%s' doesn't exist" % renpy.config.gamedir)
-+
++    
      # Note the game directory.
      game.basepath = renpy.config.gamedir
      renpy.config.searchpath = [ renpy.config.gamedir ]
diff --git a/debian/patches/04_editor.patch b/debian/patches/04_editor.patch
index a83ca7a..333396c 100644
--- a/debian/patches/04_editor.patch
+++ b/debian/patches/04_editor.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/launcher/Debian.editor.py
++++ renpy-6.12.0/launcher/Debian.editor.py
 @@ -0,0 +1,6 @@
 +# Name: Debian
 +# Version: 1
@@ -7,9 +7,9 @@
 +
 +config.editor = '/usr/bin/editor'
 +config.editor_transient = '/usr/bin/editor'
---- a/launcher/editor.rpy
-+++ b/launcher/editor.rpy
-@@ -11,7 +11,7 @@ init python:
+--- renpy-6.12.0.orig/launcher/editor.rpy
++++ renpy-6.12.0/launcher/editor.rpy
+@@ -11,7 +11,7 @@
      
      # The default name for the editor.
      if persistent.editor is None:

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