r12474 - packages/trunk/renpy/debian

[Miriam Ruiz]

Author: miriam
Date: 2011-06-23 22:52:08 +0000 (Thu, 23 Jun 2011)
New Revision: 12474

Modified:
   packages/trunk/renpy/debian/changelog
   packages/trunk/renpy/debian/control
   packages/trunk/renpy/debian/rules
Log:
Fixed some stuff and added missing dependency



Modified: packages/trunk/renpy/debian/changelog
===================================================================
--- packages/trunk/renpy/debian/changelog	2011-06-23 21:59:05 UTC (rev 12473)
+++ packages/trunk/renpy/debian/changelog	2011-06-23 22:52:08 UTC (rev 12474)
@@ -2,7 +2,7 @@
 
   [ Miriam Ruiz ]
   * New Upstream Release
-  * Added dependency: libfreetype6-dev
+  * Added dependencies: zlib1g-dev libfreetype6-dev
   * Refreshed patches
   * Upgraded Standards-Version from 3.9.1 to 3.9.2
 

Modified: packages/trunk/renpy/debian/control
===================================================================
--- packages/trunk/renpy/debian/control	2011-06-23 21:59:05 UTC (rev 12473)
+++ packages/trunk/renpy/debian/control	2011-06-23 22:52:08 UTC (rev 12474)
@@ -8,7 +8,7 @@
  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, libfreetype6-dev
+ libfribidi-dev, libglew1.5-dev, zlib1g-dev, libfreetype6-dev
 Standards-Version: 3.9.2
 Homepage: http://www.renpy.org/
 XS-Python-Version: >= 2.6

Modified: packages/trunk/renpy/debian/rules
===================================================================
--- packages/trunk/renpy/debian/rules	2011-06-23 21:59:05 UTC (rev 12473)
+++ packages/trunk/renpy/debian/rules	2011-06-23 22:52:08 UTC (rev 12474)
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 PYVERS=$(shell pyversions -vs)
+RENPY_DEPS_INSTALL="/usr::$(shell dirname "`find -O2 /usr/lib -name libfreetype.so 2>/dev/null`")"
 
 patch:
 	dh_testdir
@@ -23,7 +24,7 @@
 
 build-python%: configure-stamp
 	dh_testdir
-	export RENPY_DEPS_INSTALL="/usr::$$(dirname "$$(find -O2 /usr/lib -name libfreetype.so 2>/dev/null)")" ; \
+	export RENPY_DEPS_INSTALL=$(RENPY_DEPS_INSTALL) ; \
 		cd module && python$* setup.py build
 	touch $@
 
@@ -33,7 +34,7 @@
 	rm -rf `find . -name "*.rpyc"`
 	rm -f build-stamp configure-stamp
 	rm -f build-python* install-python*
-	-export RENPY_DEPS_INSTALL="/usr"; cd module && python setup.py clean
+	-export RENPY_DEPS_INSTALL=$(RENPY_DEPS_INSTALL); cd module && python setup.py clean
 	rm -rf module/build/
 
 	rm -rfv renpy.app lib jedit
@@ -104,10 +105,11 @@
 install-python%:
 	dh_testdir
 	dh_testroot
-	export RENPY_DEPS_INSTALL="/usr"; cd module && python$* setup.py install \
-		--no-compile \
-		--root=$(CURDIR)/debian/python-renpy \
-		;
+	export RENPY_DEPS_INSTALL=$(RENPY_DEPS_INSTALL) ; \
+		cd module && python$* setup.py install \
+			--no-compile \
+			--root=$(CURDIR)/debian/python-renpy \
+			;
 	touch $@
 
 install: install-arch install-indep