r10636 - packages/trunk/adonthell/debian

[Moritz Muehlenhoff]

Author: jmm
Date: 2009-12-24 15:44:43 +0000 (Thu, 24 Dec 2009)
New Revision: 10636

Modified:
   packages/trunk/adonthell/debian/changelog
   packages/trunk/adonthell/debian/control
   packages/trunk/adonthell/debian/rules
Log:
  * 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


Modified: packages/trunk/adonthell/debian/changelog
===================================================================
--- packages/trunk/adonthell/debian/changelog	2009-12-22 07:53:21 UTC (rev 10635)
+++ packages/trunk/adonthell/debian/changelog	2009-12-24 15:44:43 UTC (rev 10636)
@@ -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 ]

Modified: packages/trunk/adonthell/debian/control
===================================================================
--- packages/trunk/adonthell/debian/control	2009-12-22 07:53:21 UTC (rev 10635)
+++ packages/trunk/adonthell/debian/control	2009-12-24 15:44:43 UTC (rev 10636)
@@ -2,8 +2,8 @@
 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/

Modified: packages/trunk/adonthell/debian/rules
===================================================================
--- packages/trunk/adonthell/debian/rules	2009-12-22 07:53:21 UTC (rev 10635)
+++ packages/trunk/adonthell/debian/rules	2009-12-24 15:44:43 UTC (rev 10636)
@@ -13,16 +13,6 @@
 
 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: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 
+
+
+