[SCM] advanced 3D real time strategy game engine branch, master, updated. c16eb6228ca23ff0cb19e30b72fb5bf5e3487b63
Marco Amadori
marco.amadori at gmail.com
Mon Oct 26 02:10:05 UTC 2009
The following commit has been merged in the master branch:
commit 021e5494b35ccb4b407e72e9741359fd42e613b2
Author: Marco Amadori <marco.amadori at gmail.com>
Date: Mon Oct 26 01:23:34 2009 +0100
Refreshed upstream debian/patches.
* Removed patch of .desktop file at build time.
diff --git a/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch b/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch
new file mode 100644
index 0000000..96def00
--- /dev/null
+++ b/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch
@@ -0,0 +1,37 @@
+From eff481d1bad873207ac17aa62f1e38c1561b06b2 Mon Sep 17 00:00:00 2001
+From: Marco Amadori <marco.amadori at gmail.com>
+Date: Mon, 26 Oct 2009 01:32:48 +0100
+Subject: [PATCH] Fixed desktop file to freedesktop standards.
+
+* Now it pass desktop-file-validate
+./installer/freedesktop/applications/spring.desktop test.
+* Removed shebang.
+---
+ installer/freedesktop/applications/spring.desktop | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/installer/freedesktop/applications/spring.desktop b/installer/freedesktop/applications/spring.desktop
+index e1cb26d..5a3abd1 100755
+--- a/installer/freedesktop/applications/spring.desktop
++++ b/installer/freedesktop/applications/spring.desktop
+@@ -1,14 +1,13 @@
+-#!/usr/bin/env xdg-open
+ [Desktop Entry]
+ Name=Spring
+-MimeType=application/x-spring-demo
++MimeType=application/x-spring-demo;
+ Comment=An open source RTS with similar gameplay to TA
+ Comment[de]=Open-Source Multiplayerstrategie
+ Comment[it]=Un gioco di strategia in tempo reale multi giocatore simile a TA
+ TryExec=spring
+ Exec=spring %f
+-Icon=spring.png
++Icon=spring
+ Terminal=false
+ Type=Application
+-Categories=Application;Game;StrategyGame;
++Categories=Game;StrategyGame;
+ NoDisplay=true
+--
+1.6.4.3
+
diff --git a/debian/patches/0002-Adding-arch-dep-AI-content-path.patch b/debian/patches/0002-Adding-arch-dep-AI-content-path.patch
new file mode 100644
index 0000000..306d11d
--- /dev/null
+++ b/debian/patches/0002-Adding-arch-dep-AI-content-path.patch
@@ -0,0 +1,27 @@
+From 60e9db032fdfed427a825bb6741edff90a77c326 Mon Sep 17 00:00:00 2001
+From: Marco Amadori <marco.amadori at gmail.com>
+Date: Mon, 26 Oct 2009 01:39:47 +0100
+Subject: [PATCH] Adding arch dep AI content path.
+
+This patch permits to add another research path to look for
+AI content arch dependent data, to enable moving if off /usr/share.
+---
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1f379b3..8a4e291 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,7 @@ if (NOT MINGW)
+ set (SPRING_DATADIR_INTERNAL "${SPRING_DATADIR}${PATH_DELIM}")
+ endif (SPRING_DATADIR)
+ set (SPRING_DATADIR_INTERNAL "${SPRING_DATADIR_INTERNAL}${CMAKE_INSTALL_PREFIX}/${DATADIR}")
+- add_definitions(-DSPRING_DATADIR="${SPRING_DATADIR_INTERNAL}")
++ add_definitions(-DSPRING_DATADIR="${SPRING_DATADIR_INTERNAL}:${AI_DATADIR}")
+ endif (NOT MINGW)
+
+ set (CUSTOM_COMPILER_DEFINITIONS "" CACHE STRING "Custom flags can be defined here")
+--
+1.6.4.3
+
diff --git a/debian/patches/0003-Some-minor-spelling-corrections.patch b/debian/patches/0003-Some-minor-spelling-corrections.patch
new file mode 100644
index 0000000..98a81cf
--- /dev/null
+++ b/debian/patches/0003-Some-minor-spelling-corrections.patch
@@ -0,0 +1,165 @@
+From a444b163c528bdcc354108484fbae312c47597af Mon Sep 17 00:00:00 2001
+From: Marco Amadori <marco.amadori at gmail.com>
+Date: Mon, 26 Oct 2009 01:40:50 +0100
+Subject: [PATCH] Some minor spelling corrections
+
+---
+ rts/ExternalAI/Interface/SAIInterfaceCallback.h | 2 +-
+ rts/Game/Console.h | 2 +-
+ rts/Game/Game.h | 4 ++--
+ rts/Game/PreGame.cpp | 2 +-
+ rts/Game/PreGame.h | 4 ++--
+ rts/Map/SM3/terrain/Terrain.h | 2 +-
+ rts/Map/SM3/terrain/TerrainTexture.cpp | 6 +++---
+ rts/System/Net/UDPConnection.h | 4 ++--
+ rts/System/creg/Serializer.cpp | 2 +-
+ 9 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/rts/ExternalAI/Interface/SAIInterfaceCallback.h b/rts/ExternalAI/Interface/SAIInterfaceCallback.h
+index 2bfd547..b04256b 100644
+--- a/rts/ExternalAI/Interface/SAIInterfaceCallback.h
++++ b/rts/ExternalAI/Interface/SAIInterfaceCallback.h
+@@ -28,7 +28,7 @@ extern "C" {
+ * AI Interface -> engine callback.
+ * Each AI Interface will receive an instance of this struct at initialization.
+ * The interfaceId passed as the first parameter to each function in this struct
+- * has to be the same as the one recieved by the interface,
++ * has to be the same as the one received by the interface,
+ * when it received the instance of this struct.
+ * @see SAIInterfaceLibrary
+ */
+diff --git a/rts/Game/Console.h b/rts/Game/Console.h
+index dfec884..05b62f4 100644
+--- a/rts/Game/Console.h
++++ b/rts/Game/Console.h
+@@ -24,7 +24,7 @@ protected:
+ /**
+ @brief register a command
+
+- PushAction will be called if this command is recieved by the console
++ PushAction will be called if this command is received by the console
+ */
+ void RegisterAction(const std::string& name);
+ };
+diff --git a/rts/Game/Game.h b/rts/Game/Game.h
+index 7137089..49f7bb2 100644
+--- a/rts/Game/Game.h
++++ b/rts/Game/Game.h
+@@ -133,10 +133,10 @@ private:
+ void GameEnd();
+ /// Send a message to other players (allows prefixed messages with e.g. "a:...")
+ void SendNetChat(std::string message, int destination = -1);
+- /// Format and display a chat message recieved over network
++ /// Format and display a chat message received over network
+ void HandleChatMsg(const ChatMessage& msg);
+
+- /// synced actions (recieved from server) go in here
++ /// synced actions (received from server) go in here
+ void ActionReceived(const Action&, int playernum);
+
+ void DrawInputText();
+diff --git a/rts/Game/PreGame.cpp b/rts/Game/PreGame.cpp
+index 06ee491..a9f5028 100644
+--- a/rts/Game/PreGame.cpp
++++ b/rts/Game/PreGame.cpp
+@@ -244,7 +244,7 @@ void CPreGame::UpdateClientNet()
+ return;
+ }
+ default: {
+- logOutput.Print("Unknown net-msg recieved from CPreGame: %i", int(packet->data[0]));
++ logOutput.Print("Unknown net-msg received from CPreGame: %i", int(packet->data[0]));
+ break;
+ }
+ }
+diff --git a/rts/Game/PreGame.h b/rts/Game/PreGame.h
+index 9c813b8..2b70dc3 100644
+--- a/rts/Game/PreGame.h
++++ b/rts/Game/PreGame.h
+@@ -62,9 +62,9 @@ private:
+ void GameDataReceived(boost::shared_ptr<const netcode::RawPacket> packet);
+
+ /**
+- @brief GameData we recieved from server
++ @brief GameData we received from server
+
+- We won't start until we recieved this
++ We won't start until we received this
+ */
+ boost::scoped_ptr<const GameData> gameData;
+ boost::scoped_ptr<const ClientSetup> settings;
+diff --git a/rts/Map/SM3/terrain/Terrain.h b/rts/Map/SM3/terrain/Terrain.h
+index 383a747..c7d0ec8 100644
+--- a/rts/Map/SM3/terrain/Terrain.h
++++ b/rts/Map/SM3/terrain/Terrain.h
+@@ -94,7 +94,7 @@ namespace terrain {
+ float anisotropicFiltering; // level of anisotropic filtering - default is 0 (no anisotropy)
+
+ bool useStaticShadow;
+- bool forceFallbackTexturing; // only use GL_ARB_texture_env_combine even if shader GL extensions are avaiable
++ bool forceFallbackTexturing; // only use GL_ARB_texture_env_combine even if shader GL extensions are available
+ int maxLodLevel; // lower max lod usually requires less heavy texturing but more geometry
+ };
+
+diff --git a/rts/Map/SM3/terrain/TerrainTexture.cpp b/rts/Map/SM3/terrain/TerrainTexture.cpp
+index beefd47..5399b0e 100644
+--- a/rts/Map/SM3/terrain/TerrainTexture.cpp
++++ b/rts/Map/SM3/terrain/TerrainTexture.cpp
+@@ -161,9 +161,9 @@ namespace terrain {
+ if (cb) cb->PrintMsg (" parsing texture stages...");
+
+ if (!GLEW_ARB_multitexture)
+- throw std::runtime_error ("No multitexture avaiable");
++ throw std::runtime_error ("No multitexture available");
+ if (!GLEW_ARB_texture_env_combine)
+- throw std::runtime_error ("Texture env combine extension not avaiable");
++ throw std::runtime_error ("Texture env combine extension not available");
+
+ heightmapW = heightmap->w;
+ tdfParser = tdf;
+@@ -289,7 +289,7 @@ namespace terrain {
+ lightmap = new Lightmap(heightmap, 2, 1,li);
+ }
+
+- // see how lighting should be implemented, based on config and avaiable textures
++ // see how lighting should be implemented, based on config and available textures
+ InstantiateShaders(cfg, cb);
+
+ if (cb) { cb->PrintMsg (" initializing terrain node shaders..."); }
+diff --git a/rts/System/Net/UDPConnection.h b/rts/System/Net/UDPConnection.h
+index 87db77a..ae2622a 100644
+--- a/rts/System/Net/UDPConnection.h
++++ b/rts/System/Net/UDPConnection.h
+@@ -53,7 +53,7 @@ public:
+ /**
+ How Spring protocolheader looks like (size in bytes):
+ 4 (int): number of packet (continuous)
+-4 (int): last in order (tell the client we recieved all packages with packetNumber less or equal)
++4 (int): last in order (tell the client we received all packages with packetNumber less or equal)
+ 1 (unsigned char): nak (we missed x packets, starting with firstUnacked)
+
+ */
+@@ -144,7 +144,7 @@ private:
+ int currentNum;
+
+ void SendPacket(Packet& pkt);
+- /// packets we have recieved but not yet read
++ /// packets we have received but not yet read
+ packetMap waitingPackets;
+ int lastInOrder;
+ int lastNak;
+diff --git a/rts/System/creg/Serializer.cpp b/rts/System/creg/Serializer.cpp
+index 1d530f8..b46feef 100644
+--- a/rts/System/creg/Serializer.cpp
++++ b/rts/System/creg/Serializer.cpp
+@@ -509,7 +509,7 @@ void CInputStreamSerializer::SerializeObjectPtr (void **ptr, creg::Class *cls)
+ StoredObject &o = objects [id];
+ if (o.obj) *ptr = o.obj;
+ else {
+- // The object is not yet avaiable, so it needs fixing afterwards
++ // The object is not yet available, so it needs fixing afterwards
+ *ptr = (void*) 1;
+ UnfixedPtr ufp;
+ ufp.objID = id;
+--
+1.6.4.3
+
diff --git a/debian/patches/01_Add_support_for_separate_AI_DATADIR.patch b/debian/patches/01_Add_support_for_separate_AI_DATADIR.patch
deleted file mode 100644
index f877b4d..0000000
--- a/debian/patches/01_Add_support_for_separate_AI_DATADIR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch permits to add another research path for spring to look for AI
- content, where arch dependent data could be present and hence moved out of
-/usr/share.
---- spring-0.80.5.orig/CMakeLists.txt
-+++ spring-0.80.5/CMakeLists.txt
-@@ -69,7 +69,7 @@
- set (SPRING_DATADIR_INTERNAL "${SPRING_DATADIR}${PATH_DELIM}")
- endif (SPRING_DATADIR)
- set (SPRING_DATADIR_INTERNAL "${SPRING_DATADIR_INTERNAL}${CMAKE_INSTALL_PREFIX}/${DATADIR}")
-- add_definitions(-DSPRING_DATADIR="${SPRING_DATADIR_INTERNAL}")
-+ add_definitions(-DSPRING_DATADIR="${SPRING_DATADIR_INTERNAL}:${AI_DATADIR}")
- endif (NOT MINGW)
-
- set (CUSTOM_COMPILER_DEFINITIONS "" CACHE STRING "Custom flags can be defined here")
diff --git a/debian/patches/02_Fix_spelling.patch b/debian/patches/02_Fix_spelling.patch
deleted file mode 100644
index 358d15f..0000000
--- a/debian/patches/02_Fix_spelling.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Just some minor typo corrections from lintian tips.
---- spring-0.80.5.orig/rts/ExternalAI/Interface/SAIInterfaceCallback.h
-+++ spring-0.80.5/rts/ExternalAI/Interface/SAIInterfaceCallback.h
-@@ -28,7 +28,7 @@ extern "C" {
- * AI Interface -> engine callback.
- * Each AI Interface will receive an instance of this struct at initialization.
- * The interfaceId passed as the first parameter to each function in this struct
-- * has to be the same as the one recieved by the interface,
-+ * has to be the same as the one received by the interface,
- * when it received the instance of this struct.
- * @see SAIInterfaceLibrary
- */
---- spring-0.80.5.orig/rts/Game/Console.h
-+++ spring-0.80.5/rts/Game/Console.h
-@@ -24,7 +24,7 @@ protected:
- /**
- @brief register a command
-
-- PushAction will be called if this command is recieved by the console
-+ PushAction will be called if this command is received by the console
- */
- void RegisterAction(const std::string& name);
- };
---- spring-0.80.5.orig/rts/Game/Game.h
-+++ spring-0.80.5/rts/Game/Game.h
-@@ -133,10 +133,10 @@ private:
- void GameEnd();
- /// Send a message to other players (allows prefixed messages with e.g. "a:...")
- void SendNetChat(std::string message, int destination = -1);
-- /// Format and display a chat message recieved over network
-+ /// Format and display a chat message received over network
- void HandleChatMsg(const ChatMessage& msg);
-
-- /// synced actions (recieved from server) go in here
-+ /// synced actions (received from server) go in here
- void ActionReceived(const Action&, int playernum);
-
- void DrawInputText();
---- spring-0.80.5.orig/rts/Game/PreGame.cpp
-+++ spring-0.80.5/rts/Game/PreGame.cpp
-@@ -244,7 +244,7 @@ void CPreGame::UpdateClientNet()
- return;
- }
- default: {
-- logOutput.Print("Unknown net-msg recieved from CPreGame: %i", int(packet->data[0]));
-+ logOutput.Print("Unknown net-msg received from CPreGame: %i", int(packet->data[0]));
- break;
- }
- }
---- spring-0.80.5.orig/rts/Game/PreGame.h
-+++ spring-0.80.5/rts/Game/PreGame.h
-@@ -62,9 +62,9 @@ private:
- void GameDataReceived(boost::shared_ptr<const netcode::RawPacket> packet);
-
- /**
-- @brief GameData we recieved from server
-+ @brief GameData we received from server
-
-- We won't start until we recieved this
-+ We won't start until we received this
- */
- boost::scoped_ptr<const GameData> gameData;
- boost::scoped_ptr<const ClientSetup> settings;
---- spring-0.80.5.orig/rts/System/Net/UDPConnection.h
-+++ spring-0.80.5/rts/System/Net/UDPConnection.h
-@@ -53,7 +53,7 @@ public:
- /**
- How Spring protocolheader looks like (size in bytes):
- 4 (int): number of packet (continuous)
--4 (int): last in order (tell the client we recieved all packages with packetNumber less or equal)
-+4 (int): last in order (tell the client we received all packages with packetNumber less or equal)
- 1 (unsigned char): nak (we missed x packets, starting with firstUnacked)
-
- */
-@@ -144,7 +144,7 @@ private:
- int currentNum;
-
- void SendPacket(Packet& pkt);
-- /// packets we have recieved but not yet read
-+ /// packets we have received but not yet read
- packetMap waitingPackets;
- int lastInOrder;
- int lastNak;
diff --git a/debian/patches/series b/debian/patches/series
index 9771522..9d8fa42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-01_Add_support_for_separate_AI_DATADIR.patch
-02_Fix_spelling.patch
+0001-Fixed-desktop-file-to-freedesktop-standards.patch
+0002-Adding-arch-dep-AI-content-path.patch
+0003-Some-minor-spelling-corrections.patch
diff --git a/debian/rules b/debian/rules
index e2b9f8f..500c9a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,6 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
- # remove shebang
- sed -i -e '/^#.*xdg/d' $(PKGDIR)/usr/share/applications/spring.desktop
-
# Configure spring to use ~/.spring as user data directory.
mkdir -p $(PKGDIR)/etc/spring
echo '$$HOME/.spring' > $(PKGDIR)/etc/spring/datadir
--
advanced 3D real time strategy game engine
More information about the Pkg-games-commits
mailing list