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

Miriam Ruiz miriam at alioth.debian.org
Fri Jun 1 23:17:23 UTC 2012


Author: miriam
Date: 2012-06-01 23:17:22 +0000 (Fri, 01 Jun 2012)
New Revision: 13649

Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/control
   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	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/changelog	2012-06-01 23:17:22 UTC (rev 13649)
@@ -1,10 +1,11 @@
-renpy (6.13.7-1) UNRELEASED; urgency=low
+renpy (6.13.12-1) UNRELEASED; urgency=low
 
   [ Miriam Ruiz ]
   * New Upstream Release
   * Refreshed patches
+  * Upgraded Standards-Version from 3.9.2 to 3.9.3
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Wed, 16 Nov 2011 18:05:38 +0100
+ -- Miriam Ruiz <little_miry at yahoo.es>  Sat, 02 Jun 2012 01:07:45 +0200
 
 renpy (6.12.2-1) unstable; urgency=low
 

Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/control	2012-06-01 23:17:22 UTC (rev 13649)
@@ -10,7 +10,7 @@
  libavutil-dev, libavformat-dev, libavcodec-dev, libswscale-dev,
  libfribidi-dev, libglew1.5-dev, zlib1g-dev, libfreetype6-dev,
  libpng12-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.renpy.org/
 XS-Python-Version: >= 2.6
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/renpy/

Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch	2012-06-01 23:17:22 UTC (rev 13649)
@@ -1,6 +1,6 @@
---- renpy-6.13.7.orig/renpy.py
-+++ renpy-6.13.7/renpy.py
-@@ -37,7 +37,14 @@
+--- renpy-6.13.12.orig/renpy.py
++++ renpy-6.13.12/renpy.py
+@@ -36,7 +36,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"
  
-@@ -77,7 +84,7 @@
+@@ -76,7 +83,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	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch	2012-06-01 23:17:22 UTC (rev 13649)
@@ -1,22 +1,19 @@
---- renpy-6.13.7.orig/renpy/bootstrap.py
-+++ renpy-6.13.7/renpy/bootstrap.py
-@@ -410,12 +410,25 @@
+--- renpy-6.13.12.orig/renpy/bootstrap.py
++++ renpy-6.13.12/renpy/bootstrap.py
+@@ -481,11 +481,25 @@
      
      simple = simple.getvalue()
      full = full.getvalue()
 - 
--    # Inside of the file, which may not be openable.
 +
-     try:
++    try:
 +        if not os.path.isdir(os.path.expanduser("~/.renpy")):
 +            os.makedirs(os.path.expanduser("~/.renpy"))
 +    except:
 +        pass
- 
--        f = file("traceback.txt", "w")
-+    # Inside of the file, which may not be openable.
-+    try:
- 
++
+     # Inside of the file, which may not be openable.
+     try:
 +        tbdir = renpy.config.savedir
 +        if tbdir[-1] == '/':
 +            tbdir = tbdir[:-1]
@@ -25,29 +22,9 @@
 +            os.makedirs(tbdir)
 +        except:
 +            pass
-+        f = file(tbdir + "traceback.txt", "w")
-         f.write(codecs.BOM_UTF8)
  
-         print >>f, "I'm sorry, but an uncaught exception occurred."
-@@ -432,11 +445,19 @@
-         
-         try:
-             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:
-                     if hasattr(os, 'startfile'):
--                        os.startfile('traceback.txt') #@UndefinedVariable
-+                        os.startfile( tbdir + 'traceback.txt' )
-         except:
-             pass
+-        f, traceback_fn = open_error_file("traceback.txt", "w")
++        f, traceback_fn = open_error_file(tbdir + "traceback.txt", "w")
  
+         f.write(codecs.BOM_UTF8)
+ 

Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch	2012-06-01 23:17:22 UTC (rev 13649)
@@ -1,6 +1,6 @@
---- renpy-6.13.7.orig/renpy/main.py
-+++ renpy-6.13.7/renpy/main.py
-@@ -161,6 +161,10 @@
+--- renpy-6.13.12.orig/renpy/main.py
++++ renpy-6.13.12/renpy/main.py
+@@ -164,6 +164,10 @@
      # Set up variants.
      choose_variants()
      

Modified: packages/trunk/renpy/debian/patches/04_editor.patch
===================================================================
--- packages/trunk/renpy/debian/patches/04_editor.patch	2012-06-01 07:38:00 UTC (rev 13648)
+++ packages/trunk/renpy/debian/patches/04_editor.patch	2012-06-01 23:17:22 UTC (rev 13649)
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ renpy-6.13.7/launcher/Debian.editor.py
++++ renpy-6.13.12/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.13.7.orig/launcher/editor.rpy
-+++ renpy-6.13.7/launcher/editor.rpy
+--- renpy-6.13.12.orig/launcher/editor.rpy
++++ renpy-6.13.12/launcher/editor.rpy
 @@ -11,7 +11,7 @@
      
      # The default name for the editor.
@@ -16,5 +16,5 @@
 -        persistent.editor = "jEdit"
 +        persistent.editor = "Debian"
      
-     # A map from editor name to the file containing information about
-     # that editor.
+     # Should we set up the editor?
+     set_editor = "RENPY_EDIT_PY" not in os.environ




More information about the Pkg-games-commits mailing list