r12820 - in packages/trunk/renpy/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2011-11-16 17:25:23 +0000 (Wed, 16 Nov 2011)
New Revision: 12820

Removed:
   packages/trunk/renpy/debian/patches/00_module_setup.patch
Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/patches/01_abspaths.patch
   packages/trunk/renpy/debian/patches/02_traceback.patch
   packages/trunk/renpy/debian/patches/03_checkdir.patch
   packages/trunk/renpy/debian/patches/04_editor.patch
   packages/trunk/renpy/debian/patches/series
Log:
New Upstream Release



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/changelog	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,3 +1,11 @@
+renpy (6.13.7-1) UNRELEASED; urgency=low
+
+  [ Miriam Ruiz ]
+  * New Upstream Release
+  * Refreshed patches
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 16 Nov 2011 18:05:38 +0100
+
 renpy (6.12.2-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Deleted: packages/trunk/renpy/debian/patches/00_module_setup.patch
===================================================================
--- packages/trunk/renpy/debian/patches/00_module_setup.patch	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/00_module_setup.patch	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,20 +0,0 @@
---- renpy-6.12.2.orig/module/setup.py
-+++ renpy-6.12.2/module/setup.py
-@@ -5,7 +5,7 @@
- import sys
- 
- # These control the level of optimization versus debugging.
--extra_compile_args = [ "-O3", "-Wno-unused-function" ]
-+extra_compile_args = [ "-O2", "-Wno-unused-function" ]
- # extra_compile_args = [ "-O0", "-ggdb" ]
- # extra_compile_args = [ "-O0", "-gstabs" ]
- extra_link_args = [ ]
-@@ -286,7 +286,7 @@
- 
- distutils.core.setup(
-     name = "renpy_module",
--    version = renpy.version[7:], #@UndefinedVariable
-+    version = renpy.version[7:],
-     ext_modules = extensions,
-     py_modules = py_modules,
-     package_dir = { '' : 'lib' },

Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,6 +1,6 @@
---- renpy-6.12.2.orig/renpy.py
-+++ renpy-6.12.2/renpy.py
-@@ -39,7 +39,14 @@
+--- renpy-6.13.7.orig/renpy.py
++++ renpy-6.13.7/renpy.py
+@@ -37,7 +37,14 @@
  # the path to a directory that will hold save files.
  def path_to_saves(gamedir):
      import renpy #@UnresolvedImport
@@ -16,7 +16,7 @@
      if not renpy.config.save_directory:
          return gamedir + "/saves"
  
-@@ -79,7 +86,7 @@
+@@ -77,7 +84,7 @@
  # Returns the path to the Ren'Py base directory (containing common and
  # the launcher, usually.)
  def path_to_renpy_base():

Modified: packages/trunk/renpy/debian/patches/02_traceback.patch
===================================================================
--- packages/trunk/renpy/debian/patches/02_traceback.patch	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,6 +1,6 @@
---- renpy-6.12.2.orig/renpy/bootstrap.py
-+++ renpy-6.12.2/renpy/bootstrap.py
-@@ -408,12 +408,25 @@
+--- renpy-6.13.7.orig/renpy/bootstrap.py
++++ renpy-6.13.7/renpy/bootstrap.py
+@@ -410,12 +410,25 @@
      
      simple = simple.getvalue()
      full = full.getvalue()
@@ -29,7 +29,7 @@
          f.write(codecs.BOM_UTF8)
  
          print >>f, "I'm sorry, but an uncaught exception occurred."
-@@ -430,10 +443,18 @@
+@@ -432,11 +445,19 @@
          
          try:
              if editor:
@@ -45,8 +45,9 @@
 -                    renpy.exports.launch_editor([ 'traceback.txt' ], 1, transient=1)
 +                    renpy.exports.launch_editor([ tbdir + 'traceback.txt' ], 1, transient=1)
                  else:
--                    os.startfile('traceback.txt') #@UndefinedVariable
-+                    os.startfile( tbdir + 'traceback.txt' )
+                     if hasattr(os, 'startfile'):
+-                        os.startfile('traceback.txt') #@UndefinedVariable
++                        os.startfile( tbdir + 'traceback.txt' )
          except:
              pass
  

Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,5 +1,5 @@
---- renpy-6.12.2.orig/renpy/main.py
-+++ renpy-6.12.2/renpy/main.py
+--- renpy-6.13.7.orig/renpy/main.py
++++ renpy-6.13.7/renpy/main.py
 @@ -161,6 +161,10 @@
      # Set up variants.
      choose_variants()

Modified: packages/trunk/renpy/debian/patches/04_editor.patch
===================================================================
--- packages/trunk/renpy/debian/patches/04_editor.patch	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/04_editor.patch	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ renpy-6.12.2/launcher/Debian.editor.py
++++ renpy-6.13.7/launcher/Debian.editor.py
 @@ -0,0 +1,6 @@
 +# Name: Debian
 +# Version: 1
@@ -7,8 +7,8 @@
 +
 +config.editor = '/usr/bin/editor'
 +config.editor_transient = '/usr/bin/editor'
---- renpy-6.12.2.orig/launcher/editor.rpy
-+++ renpy-6.12.2/launcher/editor.rpy
+--- renpy-6.13.7.orig/launcher/editor.rpy
++++ renpy-6.13.7/launcher/editor.rpy
 @@ -11,7 +11,7 @@
      
      # The default name for the editor.

Modified: packages/trunk/renpy/debian/patches/series
===================================================================
--- packages/trunk/renpy/debian/patches/series	2011-11-16 13:31:20 UTC (rev 12819)
+++ packages/trunk/renpy/debian/patches/series	2011-11-16 17:25:23 UTC (rev 12820)
@@ -1,4 +1,4 @@
-00_module_setup.patch
+#00_module_setup.patch
 01_abspaths.patch
 02_traceback.patch
 03_checkdir.patch