[adonthell] 07/65: merge NMU

[Markus Koschany]

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

apo pushed a commit to branch master
in repository adonthell.

commit 354fa1c75b08a12e1487e5b843ffe5ec903bb6d5
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Aug 30 18:05:01 2008 +0000

    merge NMU
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d87d822..326e677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,13 @@ adonthell (0.3.4.cvs.20080529-2) UNRELEASED; urgency=low
 
  -- 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 ]
diff --git a/debian/control b/debian/control
index 8bc3a14..b97df91 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 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/
diff --git a/debian/rules b/debian/rules
index 074f0c6..406cf33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,20 @@ CXXFLAGS = -Wall -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games
 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 @@ binary-arch: build install
 	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

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