r12471 - in packages/trunk/renpy/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Thu Jun 23 20:38:38 UTC 2011
Author: miriam
Date: 2011-06-23 20:38:38 +0000 (Thu, 23 Jun 2011)
New Revision: 12471
Modified:
packages/trunk/renpy/debian/changelog
packages/trunk/renpy/debian/patches/00_module_setup.patch
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
Log:
New Upstream Release
Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog 2011-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/changelog 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,3 +1,11 @@
+renpy (6.12.1-1) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * New Upstream Release
+ * Refreshed patches
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Thu, 23 Jun 2011 22:28:07 +0200
+
renpy (6.12.0-1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/renpy/debian/patches/00_module_setup.patch
===================================================================
--- packages/trunk/renpy/debian/patches/00_module_setup.patch 2011-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/patches/00_module_setup.patch 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,11 +1,11 @@
---- renpy-6.12.0.orig/module/setup.py
-+++ renpy-6.12.0/module/setup.py
-@@ -7,7 +7,7 @@
- import subprocess
+--- renpy-6.12.1.orig/module/setup.py
++++ renpy-6.12.1/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 = [ "-O3", "-funroll-loops", "-ggdb" ]
# extra_compile_args = [ "-O0", "-ggdb" ]
# extra_compile_args = [ "-O0", "-gstabs" ]
+ extra_link_args = [ ]
Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch 2011-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,9 +1,9 @@
---- renpy-6.12.0.orig/renpy.py
-+++ renpy-6.12.0/renpy.py
-@@ -40,7 +40,14 @@
+--- renpy-6.12.1.orig/renpy.py
++++ renpy-6.12.1/renpy.py
+@@ -39,7 +39,14 @@
# the path to a directory that will hold save files.
def path_to_saves(gamedir):
- import renpy
+ import renpy #@UnresolvedImport
-
+
+ if gamedir.startswith("/usr/share/games/renpy"):
@@ -16,7 +16,7 @@
if not renpy.config.save_directory:
return gamedir + "/saves"
-@@ -80,7 +87,7 @@
+@@ -79,7 +86,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-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,19 +1,22 @@
---- 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)
+--- renpy-6.12.1.orig/renpy/bootstrap.py
++++ renpy-6.12.1/renpy/bootstrap.py
+@@ -408,12 +408,25 @@
-+ try:
+ simple = simple.getvalue()
+ full = full.getvalue()
+-
+- # Inside of the file, which may not be openable.
++
+ try:
+ if not os.path.isdir(os.path.expanduser("~/.renpy")):
+ os.makedirs(os.path.expanduser("~/.renpy"))
+ except:
+ pass
-+
- # Inside of the file, which may not be openable.
- try:
- f = file("traceback.txt", "w")
++ # Inside of the file, which may not be openable.
++ try:
+
+ tbdir = renpy.config.savedir
+ if tbdir[-1] == '/':
+ tbdir = tbdir[:-1]
@@ -23,27 +26,27 @@
+ except:
+ pass
+ f = file(tbdir + "traceback.txt", "w")
-
f.write(codecs.BOM_UTF8)
-@@ -420,10 +434,18 @@
- renpy.log.info_exception()
+ print >>f, "I'm sorry, but an uncaught exception occurred."
+@@ -430,10 +443,18 @@
try:
-+ tbdir = renpy.config.savedir
-+ if tbdir[-1] == '/':
-+ tbdir = tbdir[:-1]
-+ tbdir = os.path.dirname(tbdir) + '/'
-+ try:
-+ os.makedirs(tbdir)
-+ except:
-+ pass
- if renpy.config.editor:
-- renpy.exports.launch_editor([ 'traceback.txt' ], 1, transient=1)
-+ renpy.exports.launch_editor([ tbdir + 'traceback.txt' ], 1, transient=1)
- else:
-- os.startfile('traceback.txt')
-+ os.startfile( tbdir + 'traceback.txt' )
+ if editor:
++ tbdir = renpy.config.savedir
++ if tbdir[-1] == '/':
++ tbdir = tbdir[:-1]
++ tbdir = os.path.dirname(tbdir) + '/'
++ try:
++ os.makedirs(tbdir)
++ except:
++ pass
+ if renpy.config.editor:
+- 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' )
except:
pass
Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch 2011-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,8 +1,8 @@
---- 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 ]
+--- renpy-6.12.1.orig/renpy/main.py
++++ renpy-6.12.1/renpy/main.py
+@@ -159,6 +159,10 @@
+ # Set up variants.
+ choose_variants()
+ # Check if the game directory exists and is a directory
+ if not os.path.isdir(renpy.config.gamedir):
Modified: packages/trunk/renpy/debian/patches/04_editor.patch
===================================================================
--- packages/trunk/renpy/debian/patches/04_editor.patch 2011-06-23 10:52:19 UTC (rev 12470)
+++ packages/trunk/renpy/debian/patches/04_editor.patch 2011-06-23 20:38:38 UTC (rev 12471)
@@ -1,5 +1,5 @@
--- /dev/null
-+++ renpy-6.12.0/launcher/Debian.editor.py
++++ renpy-6.12.1/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.0.orig/launcher/editor.rpy
-+++ renpy-6.12.0/launcher/editor.rpy
+--- renpy-6.12.1.orig/launcher/editor.rpy
++++ renpy-6.12.1/launcher/editor.rpy
@@ -11,7 +11,7 @@
# The default name for the editor.
More information about the Pkg-games-commits
mailing list