[SCM] advanced 3D real time strategy game engine branch, master, updated. upstream/0.80.5.1-21-g2f7e2f5
Marco Amadori
marco.amadori at gmail.com
Fri Nov 13 17:30:12 UTC 2009
The following commit has been merged in the master branch:
commit 2f7e2f58043c50bd5b826b870d255bbdb7ba873f
Author: Marco Amadori <marco.amadori at gmail.com>
Date: Fri Nov 13 09:32:36 2009 +0100
Removed quilt patches, merged upstream.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 496a070..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses quilt to handle patches to upstream sources.
-
-Look at /usr/share/doc/quilt/README.source for more informations.
diff --git a/debian/changelog b/debian/changelog
index 20dc388..18670fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-spring (0.80.5.1-1) unstable; urgency=low
+spring (0.80.5.2-1) unstable; urgency=low
* Initial release (Closes: #367883).
* Thanks to Scott Ritchie <scottritchie at ubuntu.com> and Chris Clearwater
<chris at detrino.org> for their MOTU packaging which gave me a couple of
hints.
- -- Marco Amadori <marco.amadori at gmail.com> Mon, 26 Oct 2009 22:00:00 +0200
+ -- Marco Amadori <marco.amadori at gmail.com> Fri, 13 Nov 2009 13:00:00 +0100
diff --git a/debian/control b/debian/control
index 23e6088..7213610 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Marco Amadori <marco.amadori at gmail.com>
Build-Depends: debhelper (>= 7.0.50~),
- quilt (>= 0.40),
cmake,
asciidoc,
docbook-xsl,
diff --git a/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch b/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch
deleted file mode 100644
index 96def00..0000000
--- a/debian/patches/0001-Fixed-desktop-file-to-freedesktop-standards.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index 306d11d..0000000
--- a/debian/patches/0002-Adding-arch-dep-AI-content-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 98a81cf..0000000
--- a/debian/patches/0003-Some-minor-spelling-corrections.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-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/series b/debian/patches/series
deleted file mode 100644
index 9d8fa42..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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 8e82936..6ee75a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ TMPINSTDIR := $(CURDIR)/debian/tmp
export DEB_BUILD_OPTIONS := parallel=8
override_dh_auto_configure:
- dh_auto_configure -- -DBINDIR=/usr/games -DLIBDIR=/usr/lib/spring -DAI_DATADIR=/usr/lib/spring -DCMAKE_BUILD_TYPE=RELEASE
+ dh_auto_configure -- -DBINDIR=/usr/games -DLIBDIR=/usr/lib/spring -DAI_LIBS_DIR=/usr/lib/spring -DAI_DATA_DIR=/usr/share/games/spring -DCMAKE_BUILD_TYPE=RELEASE
override_dh_auto_build:
+dh_auto_build
@@ -25,6 +25,9 @@ override_dh_auto_install:
rm -rf $(TMPINSTDIR)/usr/share/games/spring/fonts
mkdir -p $(TMPINSTDIR)/usr/share/games/spring/fonts
ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(TMPINSTDIR)/usr/share/games/spring/fonts
+
+ # Remove empty directories
+ find $(TMPINSTDIR) -type d -empty -delete
override_dh_installchangelogs:
+dh_installchangelogs Documentation/changelog.txt
@@ -34,6 +37,5 @@ override_dh_auto_clean:
$(MAKE) -C debian/manpages clean
%:
- +dh --with quilt $@
-
+ +dh $@
--
advanced 3D real time strategy game engine
More information about the Pkg-games-commits
mailing list