Author: baby-guest
Date: 2007-08-28 15:59:33 +0000 (Tue, 28 Aug 2007)
New Revision: 3916
Added:
packages/trunk/cultivation/debian/patches/math_h.patch
Modified:
packages/trunk/cultivation/debian/changelog
packages/trunk/cultivation/debian/patches/abs_paths.patch
packages/trunk/cultivation/debian/patches/build.patch
packages/trunk/cultivation/debian/patches/cflags.patch
packages/trunk/cultivation/debian/patches/portaudio.patch
packages/trunk/cultivation/debian/patches/series
packages/trunk/cultivation/debian/rules
Log:
New upstream release
Modified: packages/trunk/cultivation/debian/changelog
===================================================================
--- packages/trunk/cultivation/debian/changelog 2007-08-28 14:14:09 UTC (rev
3915)
+++ packages/trunk/cultivation/debian/changelog 2007-08-28 15:59:33 UTC (rev
3916)
@@ -1,3 +1,10 @@
+cultivation (8.20070809.dfsg1-1) unstable; urgency=low
+
+ [ Miriam Ruiz ]
+ * New Upstream Version.
+
+ -- Miriam Ruiz <[EMAIL PROTECTED]> Tue, 28 Aug 2007 14:36:38 +0000
+
cultivation (7.20061227.dfsg1-1) unstable; urgency=low
[ Miriam Ruiz ]
Modified: packages/trunk/cultivation/debian/patches/abs_paths.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/abs_paths.patch 2007-08-28
14:14:09 UTC (rev 3915)
+++ packages/trunk/cultivation/debian/patches/abs_paths.patch 2007-08-28
15:59:33 UTC (rev 3916)
@@ -1,5 +1,10 @@
---- cultivation-7.20061227.dfsg1.orig/game2/gameSource/game.cpp
-+++ cultivation-7.20061227.dfsg1/game2/gameSource/game.cpp
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/gameSource/game.cpp
2007-08-09 14:00:20.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp 2007-08-28
15:51:12.000000000 +0000
@@ -43,6 +43,8 @@
#include <time.h>
@@ -9,7 +14,7 @@
#include "minorGems/graphics/openGL/ScreenGL.h"
#include "minorGems/graphics/openGL/SceneHandlerGL.h"
#include "minorGems/graphics/Color.h"
-@@ -897,7 +899,7 @@
+@@ -902,7 +904,7 @@
// load font image
TGAImageConverter tga;
@@ -18,7 +23,7 @@
FileInputStream fontInput( &fontFile );
Image *fontImage = tga.deformatImage( &fontInput );
-@@ -980,7 +983,7 @@
+@@ -985,7 +987,7 @@
mCurrentTipStoredItem = -1;
// translation language for tool tips
@@ -27,7 +32,7 @@
if( languageNameFile.exists() ) {
char *languageNameText = languageNameFile.readFileContents();
-@@ -993,6 +997,7 @@
+@@ -998,6 +1000,7 @@
if( numTokens > 0 ) {
char *languageName = *( tokens->getElement( 0 ) );
@@ -35,8 +40,10 @@
TranslationManager::setLanguage( languageName );
}
else {
---- cultivation-7.20061227.dfsg1.orig/game2/gameSource/features.cpp
-+++ cultivation-7.20061227.dfsg1/game2/gameSource/features.cpp
+Index: cultivation-8.20070809.dfsg1/game2/gameSource/features.cpp
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/gameSource/features.cpp
2006-12-27 05:30:28.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/gameSource/features.cpp 2007-08-28
15:51:12.000000000 +0000
@@ -7,6 +7,7 @@
@@ -54,8 +61,10 @@
char stringBuffer[100];
int switchValue;
---- cultivation-7.20061227.dfsg1.orig/game2/gameSource/defs.h
-+++ cultivation-7.20061227.dfsg1/game2/gameSource/defs.h
+Index: cultivation-8.20070809.dfsg1/game2/gameSource/defs.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/gameSource/defs.h 2007-08-28
15:51:12.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef DEFS_INCLUDED
+#define DEFS_INCLUDED
Modified: packages/trunk/cultivation/debian/patches/build.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/build.patch 2007-08-28
14:14:09 UTC (rev 3915)
+++ packages/trunk/cultivation/debian/patches/build.patch 2007-08-28
15:59:33 UTC (rev 3916)
@@ -1,11 +1,16 @@
---- cultivation-7.20061227.orig/game2/Makefile.GnuLinux
-+++ cultivation-7.20061227/game2/Makefile.GnuLinux
-@@ -17,7 +17,7 @@
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: cultivation-8.20070809.dfsg1/game2/Makefile.GnuLinux
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/Makefile.GnuLinux 2007-08-28
15:51:06.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/Makefile.GnuLinux 2007-08-28
15:51:08.000000000 +0000
+@@ -20,7 +20,7 @@
# various GL and X windows librariesneeded for linux
# also need portaudio library (which in turn needs pthreads)
--PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext
-lXmu ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread
-+PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext
-lXmu -lportaudio -lpthread
+-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11
${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread
++PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lportaudio
-lpthread
# All platforms but OSX support g++ and need no linker hacks
Modified: packages/trunk/cultivation/debian/patches/cflags.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/cflags.patch 2007-08-28
14:14:09 UTC (rev 3915)
+++ packages/trunk/cultivation/debian/patches/cflags.patch 2007-08-28
15:59:33 UTC (rev 3916)
@@ -1,7 +1,11 @@
-diff -ruN cultivation-7.20061227.dfsg1.orig/game2/Makefile.common
cultivation-7.20061227.dfsg1/game2/Makefile.common
---- cultivation-7.20061227.dfsg1.orig/game2/Makefile.common 2007-06-09
02:11:46.217603000 +0000
-+++ cultivation-7.20061227.dfsg1/game2/Makefile.common 2007-06-09
02:13:18.075344407 +0000
-@@ -50,7 +50,9 @@
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: cultivation-8.20070809.dfsg1/game2/Makefile.common
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/Makefile.common 2007-08-28
15:51:09.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/Makefile.common 2007-08-28
15:51:11.000000000 +0000
+@@ -51,7 +51,9 @@
Added: packages/trunk/cultivation/debian/patches/math_h.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/math_h.patch
(rev 0)
+++ packages/trunk/cultivation/debian/patches/math_h.patch 2007-08-28
15:59:33 UTC (rev 3916)
@@ -0,0 +1,15 @@
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundEffectsBank.cpp
+===================================================================
+---
cultivation-8.20070809.dfsg1.orig/game2/gameSource/sound/SoundEffectsBank.cpp
2007-08-28 15:57:18.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundEffectsBank.cpp
2007-08-28 15:57:32.000000000 +0000
+@@ -10,6 +10,7 @@
+
+ #include "minorGems/util/random/StdRandomSource.h"
+
++#include <math.h>
+
+ extern int globalSoundSampleRate;
+
Modified: packages/trunk/cultivation/debian/patches/portaudio.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/portaudio.patch 2007-08-28
14:14:09 UTC (rev 3915)
+++ packages/trunk/cultivation/debian/patches/portaudio.patch 2007-08-28
15:59:33 UTC (rev 3916)
@@ -1,5 +1,10 @@
---- cultivation-7.20061227.dfsg1.orig/game2/gameSource/sound/SoundPlayer.h
-+++ cultivation-7.20061227.dfsg1/game2/gameSource/sound/SoundPlayer.h
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundPlayer.h
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/gameSource/sound/SoundPlayer.h
2006-10-02 22:29:43.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundPlayer.h
2007-08-28 15:51:09.000000000 +0000
@@ -52,8 +52,7 @@
#include "SoundFilter.h"
#include "PlayableSound.h"
@@ -10,9 +15,11 @@
#include "minorGems/util/SimpleVector.h"
---- cultivation-7.20061227.dfsg1.orig/game2/Makefile.common
-+++ cultivation-7.20061227.dfsg1/game2/Makefile.common
-@@ -42,7 +42,6 @@
+Index: cultivation-8.20070809.dfsg1/game2/Makefile.common
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/game2/Makefile.common 2007-04-23
14:30:54.000000000 +0000
++++ cultivation-8.20070809.dfsg1/game2/Makefile.common 2007-08-28
15:51:22.000000000 +0000
+@@ -43,7 +43,6 @@
OPTIMIZE_FLAG = ${OPTIMIZE_ON_FLAG}
@@ -20,7 +27,7 @@
# common to all platforms
-@@ -51,7 +50,7 @@
+@@ -52,7 +51,7 @@
@@ -29,8 +36,10 @@
COMPILE = ${GXX} ${COMPILE_FLAGS} -c
---- cultivation-7.20061227.dfsg1.orig/runToBuild
-+++ cultivation-7.20061227.dfsg1/runToBuild
+Index: cultivation-8.20070809.dfsg1/runToBuild
+===================================================================
+--- cultivation-8.20070809.dfsg1.orig/runToBuild 2007-08-09
16:14:40.000000000 +0000
++++ cultivation-8.20070809.dfsg1/runToBuild 2007-08-28 15:51:09.000000000
+0000
@@ -16,13 +16,13 @@
./configure
Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series 2007-08-28 14:14:09 UTC
(rev 3915)
+++ packages/trunk/cultivation/debian/patches/series 2007-08-28 15:59:33 UTC
(rev 3916)
@@ -1,4 +1,5 @@
build.patch
portaudio.patch
cflags.patch
-abs_paths.patch
\ No newline at end of file
+abs_paths.patch
+math_h.patch
Modified: packages/trunk/cultivation/debian/rules
===================================================================
--- packages/trunk/cultivation/debian/rules 2007-08-28 14:14:09 UTC (rev
3915)
+++ packages/trunk/cultivation/debian/rules 2007-08-28 15:59:33 UTC (rev
3916)
@@ -74,15 +74,15 @@
get-orig-source:
dh_testdir
dh_testroot
- wget
http://mesh.dl.sourceforge.net/sourceforge/cultivation/Cultivation_7_UnixSource.tar.gz
- tar xvfz Cultivation_7_UnixSource.tar.gz
- cd Cultivation_7_UnixSource && rm -rf \
+ wget
http://mesh.dl.sourceforge.net/sourceforge/cultivation/Cultivation_8_UnixSource.tar.gz
+ tar xvfz Cultivation_8_UnixSource.tar.gz
+ cd Cultivation_8_UnixSource && rm -rf \
minorGems/sound/portaudio \
minorGems/util/development/fortify \
minorGems/graphics/openGL/tga.* \
minorGems/graphics/openGL/texture.*
- tar cvfz ../cultivation_7.20061227.dfsg1.orig.tar.gz
Cultivation_7_UnixSource
- rm -rf Cultivation_7_UnixSource.tar.gz Cultivation_7_UnixSource
+ tar cvfz ../cultivation_8.20070809.dfsg1.orig.tar.gz
Cultivation_8_UnixSource
+ rm -rf Cultivation_8_UnixSource.tar.gz Cultivation_8_UnixSource
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
get-orig-source
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
