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

[Miriam Ruiz]

Author: miriam
Date: 2011-08-15 01:22:24 +0000 (Mon, 15 Aug 2011)
New Revision: 12612

Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/control
   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:
Prepare release



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2011-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/changelog	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,12 +1,13 @@
-renpy (6.12.1-1) UNRELEASED; urgency=low
+renpy (6.12.2-1) unstable; urgency=low
 
   [ Miriam Ruiz ]
   * New Upstream Release
-  * Added dependencies: zlib1g-dev libfreetype6-dev
   * Refreshed patches
+  * Added Build Dependencies: zlib1g-dev, libfreetype6-dev and
+    libpng12-dev. Closes: #633672
   * Upgraded Standards-Version from 3.9.1 to 3.9.2
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 23 Jun 2011 22:28:07 +0200
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 15 Aug 2011 02:37:29 +0200
 
 renpy (6.12.0-1) unstable; urgency=low
 

Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control	2011-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/control	2011-08-15 01:22:24 UTC (rev 12612)
@@ -8,7 +8,8 @@
  python-pygame (>= 1.8.1), libsdl1.2-dev, libsdl-image1.2-dev,
  libsdl-sound1.2-dev, libsdl-ttf2.0-dev, libmodplug-dev, libspeex-dev,
  libavutil-dev, libavformat-dev, libavcodec-dev, libswscale-dev,
- libfribidi-dev, libglew1.5-dev, zlib1g-dev, libfreetype6-dev
+ libfribidi-dev, libglew1.5-dev, zlib1g-dev, libfreetype6-dev,
+ libpng12-dev
 Standards-Version: 3.9.2
 Homepage: http://www.renpy.org/
 XS-Python-Version: >= 2.6

Modified: packages/trunk/renpy/debian/patches/00_module_setup.patch
===================================================================
--- packages/trunk/renpy/debian/patches/00_module_setup.patch	2011-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/patches/00_module_setup.patch	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,5 +1,5 @@
---- renpy-6.12.1.orig/module/setup.py
-+++ renpy-6.12.1/module/setup.py
+--- renpy-6.12.2.orig/module/setup.py
++++ renpy-6.12.2/module/setup.py
 @@ -5,7 +5,7 @@
  import sys
  
@@ -9,3 +9,12 @@
  # 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-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,5 +1,5 @@
---- renpy-6.12.1.orig/renpy.py
-+++ renpy-6.12.1/renpy.py
+--- renpy-6.12.2.orig/renpy.py
++++ renpy-6.12.2/renpy.py
 @@ -39,7 +39,14 @@
  # the path to a directory that will hold save files.
  def path_to_saves(gamedir):

Modified: packages/trunk/renpy/debian/patches/02_traceback.patch
===================================================================
--- packages/trunk/renpy/debian/patches/02_traceback.patch	2011-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,5 +1,5 @@
---- renpy-6.12.1.orig/renpy/bootstrap.py
-+++ renpy-6.12.1/renpy/bootstrap.py
+--- renpy-6.12.2.orig/renpy/bootstrap.py
++++ renpy-6.12.2/renpy/bootstrap.py
 @@ -408,12 +408,25 @@
      
      simple = simple.getvalue()

Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch	2011-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,6 +1,6 @@
---- renpy-6.12.1.orig/renpy/main.py
-+++ renpy-6.12.1/renpy/main.py
-@@ -159,6 +159,10 @@
+--- renpy-6.12.2.orig/renpy/main.py
++++ renpy-6.12.2/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-08-14 18:26:41 UTC (rev 12611)
+++ packages/trunk/renpy/debian/patches/04_editor.patch	2011-08-15 01:22:24 UTC (rev 12612)
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ renpy-6.12.1/launcher/Debian.editor.py
++++ renpy-6.12.2/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.1.orig/launcher/editor.rpy
-+++ renpy-6.12.1/launcher/editor.rpy
+--- renpy-6.12.2.orig/launcher/editor.rpy
++++ renpy-6.12.2/launcher/editor.rpy
 @@ -11,7 +11,7 @@
      
      # The default name for the editor.