[adonthell] 15/65: * Add myself to uploaders * Drop special case handling of Python for arm, Python 2.4 is being removed (Closes: #562401) * Drop versioned Build-Depends for python-dev, swig1.3, quilt and python-support; all satified even in Etch

[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 aef7bfb652a7c9baeb70a0f84deda3cc94a3f37d
Author: Moritz Muehlenhoff <jmm at debian.org>
Date:   Thu Dec 24 15:44:43 2009 +0000

      * Add myself to uploaders
      * Drop special case handling of Python for arm, Python 2.4 is being
        removed (Closes: #562401)
      * Drop versioned Build-Depends for python-dev, swig1.3, quilt and
        python-support; all satified even in Etch
---
 debian/changelog | 10 ++++++++++
 debian/control   |  4 ++--
 debian/rules     | 13 +++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31cc6f2..12355c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+adonthell (0.3.5-3.1) unstable; urgency=low
+
+  * Add myself to uploaders
+  * Drop special case handling of Python for arm, Python 2.4 is being
+    removed (Closes: #562401)
+  * Drop versioned Build-Depends for python-dev, swig1.3, quilt and
+    python-support; all satified even in Etch
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Thu, 24 Dec 2009 16:31:20 +0100
+
 adonthell (0.3.5-3) unstable; urgency=low
 
   [ Barry deFreese ]
diff --git a/debian/control b/debian/control
index f0f23c8..e8c49d9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: adonthell
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, Iain Lane <laney at ubuntu.com>
-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 (>= 0.40), python2.4-dev [arm armel]
+Uploaders: Barry deFreese <bdefreese at debian.org>, Iain Lane <laney at ubuntu.com>, Moritz Muehlenhoff <jmm at debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig1.3, libfreetype6-dev, libaa1-dev, python-dev, python-support, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, quilt
 Standards-Version: 3.8.3
 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 8747417..563f49a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,16 +13,6 @@ INSTALL_PROGRAM = ${INSTALL} -p -o root -g root  -m 755
 
 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)))
@@ -123,3 +113,6 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 
+
+
+

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