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

[Miriam Ruiz]

Author: miriam
Date: 2009-04-24 21:29:40 +0000 (Fri, 24 Apr 2009)
New Revision: 9642

Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/control
   packages/trunk/renpy/debian/patches/00_module_setup.patch
   packages/trunk/renpy/debian/rules
Log:
New Upstream Release



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2009-04-20 17:32:51 UTC (rev 9641)
+++ packages/trunk/renpy/debian/changelog	2009-04-24 21:29:40 UTC (rev 9642)
@@ -1,11 +1,14 @@
-renpy (6.8.0-1) UNRELEASED; urgency=low
+renpy (6.9.1-1) UNRELEASED; urgency=low
 
   [ Miriam Ruiz ]
   * New Upstream Release
   * Refreshed patches
   * Requires pygame 1.8.1 to run
+  * Added libavutil-dev, libavformat-dev, libavcodec-dev and libswscale-dev
+    to Build-Depends
+  * Upgraded Standards-Version from 3.8.0 to 3.8.1
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 13 Nov 2008 10:55:09 +0100
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 24 Apr 2009 22:15:51 +0200
 
 renpy (6.7.1-1) unstable; urgency=low
 

Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control	2009-04-20 17:32:51 UTC (rev 9641)
+++ packages/trunk/renpy/debian/control	2009-04-24 21:29:40 UTC (rev 9642)
@@ -6,8 +6,8 @@
 Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), quilt,
  python-all-dev, python-support (>= 0.6.4), python-setuptools, python-pygame (>= 1.8.1),
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-sound1.2-dev, libsdl-ttf2.0-dev,
- libmodplug-dev, libspeex-dev
-Standards-Version: 3.8.0
+ libmodplug-dev, libspeex-dev, libavutil-dev, libavformat-dev, libavcodec-dev, libswscale-dev
+Standards-Version: 3.8.1
 Homepage: http://www.renpy.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/renpy/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/renpy/?op=log

Modified: packages/trunk/renpy/debian/patches/00_module_setup.patch
===================================================================
--- packages/trunk/renpy/debian/patches/00_module_setup.patch	2009-04-20 17:32:51 UTC (rev 9641)
+++ packages/trunk/renpy/debian/patches/00_module_setup.patch	2009-04-24 21:29:40 UTC (rev 9642)
@@ -1,33 +1,11 @@
-Index: renpy-6.8.0/module/setup.py
-===================================================================
---- renpy-6.8.0.orig/module/setup.py	2008-11-13 11:00:09.000000000 +0100
-+++ renpy-6.8.0/module/setup.py	2008-11-13 11:00:13.000000000 +0100
-@@ -12,25 +12,10 @@
- except:
-     pass
+--- renpy-6.9.1.orig/module/setup.py
++++ renpy-6.9.1/module/setup.py
+@@ -12,7 +12,7 @@
  
--# This environment variable should have the full path to the installed
--# Ren'Py dependencies.
--install = os.environ.get("RENPY_DEPS_INSTALL", "/home/tom/ab/deps/install")
--
--# Check to see if that's the case.
--if not os.path.isdir(install):
--    print "The Ren'Py dependencies install directory:"
--    print
--    print install
--    print
--    print "does not exist. Please set RENPY_DEPS_INSTALL to the correct"
--    print "location of the Ren'Py dependencies install directory, and "
--    print "re-run this script."
--    sys.exit(-1)
--
- # Default compile arguements for everybody.
--include_dirs = [ install + "/include", install + "/include/SDL", install + "/include/freetype2", install + "/include/pygame"]
--library_dirs = [ install + "/lib" ]
--extra_compile_args = [ "-O3", "-funroll-loops", "-ffast-math" ]
-+include_dirs = [ "/usr/include", "/usr/include/SDL", "/usr/include/freetype2", "/usr/include/python"+platform.python_version_tuple()[0]+'.'+platform.python_version_tuple()[1]+"/pygame"]
-+library_dirs = [ "/usr/lib" ]
-+extra_compile_args = [ "-O2", "-funroll-loops", "-ffast-math" ]
- extra_link_args = [ ]
- png_libraries = [ 'png', "z" ]
- sdl_libraries = [ 'SDL' ]
+ 
+ # These control the level of optimization versus debugging.
+-extra_compile_args = [ "-O3", "-funroll-loops" ]
++extra_compile_args = [ "-O2", "-funroll-loops" ]
+ # extra_compile_args = [ "-O0", "-ggdb" ]
+ 
+ 

Modified: packages/trunk/renpy/debian/rules
===================================================================
--- packages/trunk/renpy/debian/rules	2009-04-20 17:32:51 UTC (rev 9641)
+++ packages/trunk/renpy/debian/rules	2009-04-24 21:29:40 UTC (rev 9642)
@@ -23,7 +23,7 @@
 
 build-python%: configure-stamp
 	dh_testdir
-	cd module && python$* setup.py build
+	export RENPY_DEPS_INSTALL="/usr"; cd module && python$* setup.py build
 	touch $@
 
 clean: configure
@@ -32,7 +32,7 @@
 	rm -rf `find . -name "*.rpyc"`
 	rm -f build-stamp configure-stamp
 	rm -f build-python* install-python*
-	cd module; python setup.py clean
+	export RENPY_DEPS_INSTALL="/usr"; cd module && python setup.py clean
 	rm -rf module/build/
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
@@ -84,7 +84,7 @@
 install-python%:
 	dh_testdir
 	dh_testroot
-	cd module && python$* setup.py install \
+	export RENPY_DEPS_INSTALL="/usr"; cd module && python$* setup.py install \
 		--no-compile \
 		--root=$(CURDIR)/debian/python-renpy \
 		;