[maemo-commits] [maemo-commits] r8806 - in projects/haf/trunk/pygame: . debian

[From: subversion at stage.maemo.org]

Author: osantana
Date: 2006-12-19 00:21:22 +0200 (Tue, 19 Dec 2006)
New Revision: 8806

Modified:
   projects/haf/trunk/pygame/config.py
   projects/haf/trunk/pygame/config_unix.py
   projects/haf/trunk/pygame/debian/control
   projects/haf/trunk/pygame/debian/rules
   projects/haf/trunk/pygame/setup.py
Log:
fix the build system and add a ugly hack to avoid a bug in Maemo's sdl-config


Modified: projects/haf/trunk/pygame/config.py
===================================================================
--- projects/haf/trunk/pygame/config.py	2006-12-18 21:21:10 UTC (rev 8805)
+++ projects/haf/trunk/pygame/config.py	2006-12-18 22:21:22 UTC (rev 8806)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 
 """Quick tool to help setup the needed paths and flags
 in your Setup file. This will call the appropriate sub-config

Modified: projects/haf/trunk/pygame/config_unix.py
===================================================================
--- projects/haf/trunk/pygame/config_unix.py	2006-12-18 21:21:10 UTC (rev 8805)
+++ projects/haf/trunk/pygame/config_unix.py	2006-12-18 22:21:22 UTC (rev 8806)
@@ -18,8 +18,7 @@
 
 def confirm(message):
     "ask a yes/no question, return result"
-#    reply = raw_input('\n' + message + ' [Y/n]:')
-    reply = "y" #dont ask anything	
+    reply = raw_input('\n' + message + ' [Y/n]:')
     if reply and string.lower(reply[0]) == 'n':
         return 0
     return 1
@@ -168,15 +167,20 @@
     for d in DEPS:
         d.configure(incdirs, libdirs)
 
+# INdT
+    # Ugly hack to fix the sdl-config return in Maemo platform
+    DEPS[0].cflags = "-I/usr/X11R6/include -L/usr/X11R6/lib " + DEPS[0].cflags
 
-    for d in DEPS[1:]:
-        if not d.found:
-            if not confirm("""
-Warning, some of the pygame dependencies were not found. Pygame can still
-compile and install, but games that depend on those missing dependencies
-will not run. Would you like to continue the configuration?"""):
-                raise SystemExit
-            break
+    # Remove the manual intervention requirement
+#    for d in DEPS[1:]:
+#        if not d.found:
+#            if not confirm("""
+#Warning, some of the pygame dependencies were not found. Pygame can still
+#compile and install, but games that depend on those missing dependencies
+#will not run. Would you like to continue the configuration?"""):
+#                raise SystemExit
+#            break
+# /INdT
 
     return DEPS
 

Modified: projects/haf/trunk/pygame/debian/control
===================================================================
--- projects/haf/trunk/pygame/debian/control	2006-12-18 21:21:10 UTC (rev 8805)
+++ projects/haf/trunk/pygame/debian/control	2006-12-18 22:21:22 UTC (rev 8806)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Osvaldo Santana Neto <osvaldo.santana at indt.org.br>
-Build-Depends: debhelper (>= 4.1.25), python2.5, python2.5-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-image1.2-dev (>= 1.2.0-1.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-ttf2.0-dev (>= 1.2.2-1.1), python2.5-numeric, python2.5-numeric-dev
+Build-Depends: debhelper (>= 4.1.25), python2.5, python2.5-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-image1.2-dev (>= 1.2.0-1.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-ttf2.0-dev (>= 1.2.2-1.1), python2.5-numeric, python2.5-numeric-dev, libx11-dev
 Standards-Version: 3.6.1
 
 Package: python2.5-pygame

Modified: projects/haf/trunk/pygame/debian/rules
===================================================================
--- projects/haf/trunk/pygame/debian/rules	2006-12-18 21:21:10 UTC (rev 8805)
+++ projects/haf/trunk/pygame/debian/rules	2006-12-18 22:21:22 UTC (rev 8806)
@@ -40,6 +40,7 @@
 	dh_clean -k
 	dh_installdirs
 
+	$(PYTHON) config.py -auto
 	$(PYTHON) setup.py install --no-compile --root=$(d_base)
 	$(PYTHON) -OO -m compileall -f $(d_base)
 	cp -a $(d_base)/* $(d_dev)

Modified: projects/haf/trunk/pygame/setup.py
===================================================================
--- projects/haf/trunk/pygame/setup.py	2006-12-18 21:21:10 UTC (rev 8805)
+++ projects/haf/trunk/pygame/setup.py	2006-12-18 22:21:22 UTC (rev 8806)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/env python
 #
 # This is the distutils setup script for pygame.
 # Full instructions are in "install.txt" or "install.html"