r8057 - packages/trunk/adonthell/debian

[Ansgar Burchardt]

Author: ansgar-guest
Date: 2008-08-30 18:05:01 +0000 (Sat, 30 Aug 2008)
New Revision: 8057

Modified:
   packages/trunk/adonthell/debian/changelog
   packages/trunk/adonthell/debian/control
   packages/trunk/adonthell/debian/rules
Log:
merge NMU

Modified: packages/trunk/adonthell/debian/changelog
===================================================================
--- packages/trunk/adonthell/debian/changelog	2008-08-30 17:51:32 UTC (rev 8056)
+++ packages/trunk/adonthell/debian/changelog	2008-08-30 18:05:01 UTC (rev 8057)
@@ -10,6 +10,13 @@
 
  -- Barry deFreese <bddebian at comcast.net>  Tue, 17 Jun 2008 13:42:36 +0200
 
+adonthell (0.3.4.cvs.20080529-1+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on arm and armel, thanks to peter green. (Closes: #486654)
+
+ -- Philipp Kern <pkern at debian.org>  Fri, 01 Aug 2008 11:08:10 +0200
+
 adonthell (0.3.4.cvs.20080529-1) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/adonthell/debian/control
===================================================================
--- packages/trunk/adonthell/debian/control	2008-08-30 17:51:32 UTC (rev 8056)
+++ packages/trunk/adonthell/debian/control	2008-08-30 18:05:01 UTC (rev 8057)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>= 2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, quilt
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>= 2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, quilt, python2.4-dev [arm armel]
 Standards-Version: 3.8.0
 Homepage: http://adonthell.linuxgames.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/

Modified: packages/trunk/adonthell/debian/rules
===================================================================
--- packages/trunk/adonthell/debian/rules	2008-08-30 17:51:32 UTC (rev 8056)
+++ packages/trunk/adonthell/debian/rules	2008-08-30 18:05:01 UTC (rev 8057)
@@ -8,8 +8,21 @@
 CFGDEBUG = ""
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL} -p -o root -g root  -m 755
-PYVERSION=$(shell pyversions -d)
 
+PYVERSIONNN:=$(shell pyversions -d -v)
+
+
+#for some reason when adonthell embeds python2.5 on arm(el) it fails to init
+#so use python2.4 there for now
+DEB_BUILD_ARCH_CPU ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+
+#note: DEB_BUILD_ARCH_CPU is arm on both arm and armel
+ifeq ($(DEB_BUILD_ARCH_CPU),arm)
+	PYVERSIONNN :=2.4
+endif
+
+PYVERSION :=python$(PYVERSIONNN)
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -g
 	CFGDEBUG = "--enable-py-debug"
@@ -98,7 +111,7 @@
 	dh_installmenu
 	dh_installman debian/adonthell.6
 	dh_installchangelogs ChangeLog
-	dh_pysupport -V $(shell pyversions -d -v) adonthell /usr/share/games/adonthell/modules/
+	dh_pysupport -V $(PYVERSIONNN) adonthell /usr/share/games/adonthell/modules/
 	dh_link
 	dh_strip
 	dh_compress