r14911 - in packages/trunk/renpy/debian: . patches
Miriam Ruiz
miriam at moszumanska.debian.org
Wed Feb 19 00:19:23 UTC 2014
Author: miriam
Date: 2014-02-19 00:19:23 +0000 (Wed, 19 Feb 2014)
New Revision: 14911
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_typo.patch
packages/trunk/renpy/debian/rules
Log:
New upstream release
Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/changelog 2014-02-19 00:19:23 UTC (rev 14911)
@@ -1,3 +1,12 @@
+renpy (6.16.5-1) UNRELEASED; urgency=medium
+
+ [ Miriam Ruiz ]
+ * New Upstream Release.
+ - CLoses: #732375 (Ren'Py fails to build due to freetype2 detection error)
+ * Upgraded Standards-Version from 3.9.4 to 3.9.5
+
+ -- Miriam Ruiz <miriam at debian.org> Wed, 19 Feb 2014 00:42:22 +0100
+
renpy (6.15.7-1) unstable; urgency=low
[ Evgeni Golov ]
Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/control 2014-02-19 00:19:23 UTC (rev 14911)
@@ -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.4
+Standards-Version: 3.9.5
Homepage: http://www.renpy.org/
XS-Python-Version: >= 2.6
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/renpy/
Modified: packages/trunk/renpy/debian/patches/01_abspaths.patch
===================================================================
--- packages/trunk/renpy/debian/patches/01_abspaths.patch 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/patches/01_abspaths.patch 2014-02-19 00:19:23 UTC (rev 14911)
@@ -1,18 +1,18 @@
-Index: renpy-6.15.7-source/renpy.py
+Index: renpy-6.16.5-source/renpy.py
===================================================================
---- renpy-6.15.7-source.orig/renpy.py 2013-08-30 22:12:41.277200859 +0200
-+++ renpy-6.15.7-source/renpy.py 2013-08-30 22:14:56.765200683 +0200
+--- renpy-6.16.5-source.orig/renpy.py 2014-02-19 00:49:23.114460913 +0100
++++ renpy-6.16.5-source/renpy.py 2014-02-19 00:50:41.202649634 +0100
@@ -59,6 +59,12 @@
-
+
return rv
-
+
+ if gamedir.startswith("/usr/share/games/renpy"):
+ # The gamename is the final component of the path to the gamedir
+ gamename = gamedir[len("/usr/share/games/renpy"):]
+ if gamename.endswith("/game") or gamename.endswith("/data"):
+ gamename = gamename[:-5]
+ return os.path.expanduser("~/.renpy/") + gamename + "/saves"
-
+
# No save directory given.
if not renpy.config.save_directory:
@@ -97,7 +103,7 @@
Modified: packages/trunk/renpy/debian/patches/02_traceback.patch
===================================================================
--- packages/trunk/renpy/debian/patches/02_traceback.patch 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/patches/02_traceback.patch 2014-02-19 00:19:23 UTC (rev 14911)
@@ -1,13 +1,11 @@
-Index: renpy-6.15.7-source/renpy/bootstrap.py
+Index: renpy-6.16.5-source/renpy/bootstrap.py
===================================================================
---- renpy-6.15.7-source.orig/renpy/bootstrap.py 2013-08-30 22:15:17.141200657 +0200
-+++ renpy-6.15.7-source/renpy/bootstrap.py 2013-08-30 22:15:17.133200657 +0200
-@@ -455,11 +455,25 @@
-
+--- renpy-6.16.5-source.orig/renpy/bootstrap.py 2014-02-19 00:51:20.242743907 +0100
++++ renpy-6.16.5-source/renpy/bootstrap.py 2014-02-19 00:52:57.758979165 +0100
+@@ -454,10 +454,24 @@
simple = simple.getvalue()
full = full.getvalue()
--
-+
+
+ try:
+ if not os.path.isdir(os.path.expanduser("~/.renpy")):
+ os.makedirs(os.path.expanduser("~/.renpy"))
@@ -18,7 +16,7 @@
try:
+ tbdir = renpy.config.savedir
+ if tbdir[-1] == '/':
-+ tbdir = tbdir[:-1]
++ tbdir = tbdir[:-1]
+ tbdir = os.path.dirname(tbdir) + "/"
+ try:
+ os.makedirs(tbdir)
Modified: packages/trunk/renpy/debian/patches/03_checkdir.patch
===================================================================
--- packages/trunk/renpy/debian/patches/03_checkdir.patch 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/patches/03_checkdir.patch 2014-02-19 00:19:23 UTC (rev 14911)
@@ -1,15 +1,15 @@
-Index: renpy-6.15.7-source/renpy/main.py
+Index: renpy-6.16.5-source/renpy/main.py
===================================================================
---- renpy-6.15.7-source.orig/renpy/main.py 2013-08-30 22:15:23.549200649 +0200
-+++ renpy-6.15.7-source/renpy/main.py 2013-08-30 22:15:23.541200649 +0200
-@@ -142,6 +142,10 @@
+--- renpy-6.16.5-source.orig/renpy/main.py 2014-02-19 00:55:25.495252488 +0100
++++ renpy-6.16.5-source/renpy/main.py 2014-02-19 00:57:03.751410784 +0100
+@@ -161,6 +161,10 @@
# Set up variants.
choose_variants()
-
+
+ # 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 ]
Modified: packages/trunk/renpy/debian/patches/04_typo.patch
===================================================================
--- packages/trunk/renpy/debian/patches/04_typo.patch 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/patches/04_typo.patch 2014-02-19 00:19:23 UTC (rev 14911)
@@ -1,8 +1,8 @@
-Index: renpy-6.15.7-source/module/gen/renpy.angle.gldraw.c
+Index: renpy-6.16.5-source/module/gen/renpy.angle.gldraw.c
===================================================================
---- renpy-6.15.7-source.orig/module/gen/renpy.angle.gldraw.c 2013-08-31 06:42:58.505161225 +0200
-+++ renpy-6.15.7-source/module/gen/renpy.angle.gldraw.c 2013-08-31 06:42:58.497161225 +0200
-@@ -1836,7 +1836,7 @@
+--- renpy-6.16.5-source.orig/module/gen/renpy.angle.gldraw.c 2014-02-19 00:58:17.539530666 +0100
++++ renpy-6.16.5-source/module/gen/renpy.angle.gldraw.c 2014-02-19 00:58:17.535530660 +0100
+@@ -1832,7 +1832,7 @@
*/
static PyObject *__pyx_pf_5renpy_5angle_6gldraw_6GLDraw_1set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
@@ -11,11 +11,11 @@
static PyObject *__pyx_pf_5renpy_5angle_6gldraw_6GLDraw_1set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
PyObject *__pyx_v_virtual_size = 0;
PyObject *__pyx_v_physical_size = 0;
-Index: renpy-6.15.7-source/module/gen/renpy.gl.gldraw.c
+Index: renpy-6.16.5-source/module/gen/renpy.gl.gldraw.c
===================================================================
---- renpy-6.15.7-source.orig/module/gen/renpy.gl.gldraw.c 2013-06-17 04:11:50.000000000 +0200
-+++ renpy-6.15.7-source/module/gen/renpy.gl.gldraw.c 2013-08-31 06:43:32.729161180 +0200
-@@ -1850,7 +1850,7 @@
+--- renpy-6.16.5-source.orig/module/gen/renpy.gl.gldraw.c 2014-02-19 00:58:17.539530666 +0100
++++ renpy-6.16.5-source/module/gen/renpy.gl.gldraw.c 2014-02-19 00:58:17.535530660 +0100
+@@ -1846,7 +1846,7 @@
*/
static PyObject *__pyx_pf_5renpy_2gl_6gldraw_6GLDraw_1set_mode(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
Modified: packages/trunk/renpy/debian/rules
===================================================================
--- packages/trunk/renpy/debian/rules 2014-02-14 22:37:05 UTC (rev 14910)
+++ packages/trunk/renpy/debian/rules 2014-02-19 00:19:23 UTC (rev 14911)
@@ -76,7 +76,7 @@
# data/ - Contains the data for the launcher.
dh_install -prenpy launcher usr/share/games/renpy/
# Scripts that give additional features.
- dh_install -prenpy template usr/share/games/renpy/
+ dh_install -prenpy templates usr/share/games/renpy/
dh_install -prenpy-demo tutorial/* usr/share/games/renpy/demo/
chmod +x debian/renpy-demo.sh
More information about the Pkg-games-commits
mailing list