[Tux4kids-commits] r933 - in tuxmath: build trunk trunk/src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2009-03-10 01:26:20 +0000 (Tue, 10 Mar 2009)
New Revision: 933

Added:
   tuxmath/build/osc-release.sh
Modified:
   tuxmath/build/osc-preview.sh
   tuxmath/trunk/configure
   tuxmath/trunk/configure.ac
   tuxmath/trunk/src/setup.c
   tuxmath/trunk/src/titlescreen.h
   tuxmath/trunk/tuxmath.spec.in
   tuxmath/trunk/tuxmath_preview.spec.in
Log:
removed stray "#include SDL_ttf" from setup.c and titlescreen.h
minor adjustment to configure.ac
added and tweaked scripts for opensuse build service
 


Modified: tuxmath/build/osc-preview.sh
===================================================================
--- tuxmath/build/osc-preview.sh	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/build/osc-preview.sh	2009-03-10 01:26:20 UTC (rev 933)
@@ -1,4 +1,4 @@
-export EDITOR=nano
+updexport EDITOR=nano
 rm tux*bz2
 make clean
 make distclean
@@ -12,4 +12,5 @@
 cp --remove-destination tuxmath-*.tar.bz2 ~/osc/home:dbruce/tuxmath_test
 cp --remove-destination tuxmath_preview.spec ~/osc/home:dbruce/tuxmath_test
 cd ~/osc/home:dbruce/tuxmath_test
+osc update
 osc ci

Added: tuxmath/build/osc-release.sh
===================================================================
--- tuxmath/build/osc-release.sh	                        (rev 0)
+++ tuxmath/build/osc-release.sh	2009-03-10 01:26:20 UTC (rev 933)
@@ -0,0 +1,20 @@
+export EDITOR=nano
+rm tux*bz2
+make clean
+make distclean
+autoreconf -i ../trunk
+../trunk/configure
+make
+make dist-bzip2
+cp ../trunk/doc/ChangeLog .
+mv -f ChangeLog tuxmath.changes
+cd ~/osc/Education/tuxmath
+osc update
+osc rm *bz2
+osc ci
+rm tux*bz2
+cp --remove-destination ~/tux4kids/tuxmath/build/tuxmath.changes .
+cp --remove-destination ~/tux4kids/tuxmath/build/tuxmath-*.tar.bz2 .
+cp --remove-destination ~/tux4kids/tuxmath/build/tuxmath.spec .
+osc add tuxmath-*.tar.bz2
+osc ci


Property changes on: tuxmath/build/osc-release.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/configure	2009-03-10 01:26:20 UTC (rev 933)
@@ -15052,7 +15052,7 @@
 
 # Check whether --with-sdlpango was given.
 if test "${with_sdlpango+set}" = set; then
-  withval=$with_sdlpango;
+  withval=$with_sdlpango; with_sdlpango=no
 else
   with_sdlpango=yes
 fi

Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/configure.ac	2009-03-10 01:26:20 UTC (rev 933)
@@ -95,7 +95,7 @@
 AC_ARG_WITH([sdlpango],
             [AS_HELP_STRING([--without-sdlpango],
             [don't use SDL_Pango even if available])],
-            [],
+            [with_sdlpango=no],
             [with_sdlpango=yes])
 
 if test "x$with_sdlpango" != xno; then

Modified: tuxmath/trunk/src/setup.c
===================================================================
--- tuxmath/trunk/src/setup.c	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/src/setup.c	2009-03-10 01:26:20 UTC (rev 933)
@@ -31,7 +31,6 @@
 //#include <unistd.h>
 
 #include "SDL.h"
-#include "SDL_ttf.h"
 
 #ifndef NOSOUND
 #include "SDL_mixer.h"

Modified: tuxmath/trunk/src/titlescreen.h
===================================================================
--- tuxmath/trunk/src/titlescreen.h	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/src/titlescreen.h	2009-03-10 01:26:20 UTC (rev 933)
@@ -40,7 +40,6 @@
 #include "SDL.h"
 #include "SDL_image.h"
 #include "SDL_mixer.h"
-#include "SDL_ttf.h"
 
 #ifndef MACOSX
 //#include "config.h"

Modified: tuxmath/trunk/tuxmath.spec.in
===================================================================
--- tuxmath/trunk/tuxmath.spec.in	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/tuxmath.spec.in	2009-03-10 01:26:20 UTC (rev 933)
@@ -74,7 +74,7 @@
 rm -rf $(find . -type d -name .xvpics)
 
 %build
-%configure --enable-sdlpango
+%configure --disable-rpath
 make %{?jobs:-j %jobs}
 
 %install

Modified: tuxmath/trunk/tuxmath_preview.spec.in
===================================================================
--- tuxmath/trunk/tuxmath_preview.spec.in	2009-03-09 10:44:03 UTC (rev 932)
+++ tuxmath/trunk/tuxmath_preview.spec.in	2009-03-10 01:26:20 UTC (rev 933)
@@ -81,7 +81,7 @@
 rm -rf $(find . -type d -name .xvpics)
 
 %build
-%configure --enable-sdlpango
+%configure --disable-rpath
 make %{?jobs:-j %jobs}
 
 %install