[renpy] 84/146: Fixed some stuff and added missing dependency

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository renpy.

commit d46aaa24453f1eeda505fa774ead5a58cdb1f655
Author: Miriam Ruiz <miriam at debian.org>
Date:   Thu Jun 23 22:52:08 2011 +0000

    Fixed some stuff and added missing dependency
---
 debian/changelog |  2 +-
 debian/control   |  2 +-
 debian/rules     | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8aac43e..9645748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ renpy (6.12.1-1) unstable; urgency=low
 
   [ 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
 
diff --git a/debian/control b/debian/control
index 95c429e..e0eb7e7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), quilt,
  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
diff --git a/debian/rules b/debian/rules
index 0901040..bdcf615 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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-stamp: configure $(PYVERS:%=build-python%)
 
 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 @@ clean: configure
 	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-arch: build $(PYVERS:%=install-python%)
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/renpy.git