It is indeed required on armel but your patch is buggy.
You need to use DEB_BUILD_ARCH instead of DEB_BUILD_ARCH_CPU,
which is "arm" on both, whilc D_B_A is "arm" or "armel"
Good to know.

Actually your patch works fine, since D_A_B_CPU matches "arm" both on
arm and on armel. My apologies

While it will as you say "work" it is not good to have a block of code that will both never match anything and will confuse anyone who reads it. I have attatched an updated one with a comment added and the armel test block removed.

BTW are you a DD and able to upload the patches for the bugs in adonthell and afnix?
diff -ur adonthell-0.3.4.cvs.20080529/debian/control adonthell-0.3.4.cvs.20080529.new/debian/control
--- adonthell-0.3.4.cvs.20080529/debian/control	2008-07-28 18:31:56.000000000 +0000
+++ adonthell-0.3.4.cvs.20080529.new/debian/control	2008-07-28 08:42:39.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <[EMAIL PROTECTED]>
 Uploaders: Barry deFreese <[EMAIL PROTECTED]>
-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.7.3
 Homepage: http://adonthell.linuxgames.com/
 Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/
diff -ur adonthell-0.3.4.cvs.20080529/debian/rules adonthell-0.3.4.cvs.20080529.new/debian/rules
--- adonthell-0.3.4.cvs.20080529/debian/rules	2008-07-28 18:31:56.000000000 +0000
+++ adonthell-0.3.4.cvs.20080529.new/debian/rules	2008-07-31 22:32:14.000000000 +0000
@@ -8,7 +8,20 @@
 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
@@ -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

Reply via email to