This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository dhewm3.
commit e37869393d9a25a6c0f1d7ef6f742d36c3a6dff6
Author: Tobias Frost <t...@coldtobi.de>
Date: Thu Mar 12 09:35:01 2015 +0100
Remove patch 02-spelling-errors.patch -- applied upstream
---
debian/patches/02-spelling-errors.patch | 97 ---------------------------------
debian/patches/series | 1 -
2 files changed, 98 deletions(-)
diff --git a/debian/patches/02-spelling-errors.patch
b/debian/patches/02-spelling-errors.patch
deleted file mode 100644
index c3c8f85..0000000
--- a/debian/patches/02-spelling-errors.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fixing some spelling errors
-Those words are fixed: s/unkown/unknown, s/seperate/separate.
-Fixes are only done in code, comments are only touch when the there was also
-a code location to fix in the same file.
-Author: Tobias Frost <t...@debian.org>
-Last-Update: 2015-02-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/framework/DeclAF.cpp
-+++ b/neo/framework/DeclAF.cpp
-@@ -893,7 +893,7 @@
- src.Error( "custom models not yet implemented"
);
- return false;
- } else {
-- src.Error( "unkown model type %s",
token.c_str() );
-+ src.Error( "unknown model type %s",
token.c_str() );
- return false;
- }
- } else if ( !token.Icmp( "origin" ) ) {
---- a/neo/idlib/Lexer.cpp
-+++ b/neo/idlib/Lexer.cpp
-@@ -192,7 +192,7 @@
- return idLexer::punctuations[i].p;
- }
- }
-- return "unkown punctuation";
-+ return "unknown punctuation";
- }
-
- /*
---- a/neo/idlib/Parser.cpp
-+++ b/neo/idlib/Parser.cpp
-@@ -3144,7 +3144,7 @@
- return idParser::punctuations[i].p;
- }
- }
-- return "unkown punctuation";
-+ return "unknown punctuation";
- }
-
- /*
---- a/neo/d3xp/gamesys/SysCvar.cpp
-+++ b/neo/d3xp/gamesys/SysCvar.cpp
-@@ -416,4 +416,4 @@
-
- idCVar net_serverDownload( "net_serverDownload",
"0", CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, "enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration" );
- idCVar net_serverDlBaseURL( "net_serverDlBaseURL",
"", CVAR_GAME | CVAR_ARCHIVE, "base URL for the
download redirection" );
--idCVar net_serverDlTable( "net_serverDlTable",
"", CVAR_GAME | CVAR_ARCHIVE, "pak names for which
download is provided, seperated by ;" );
-+idCVar net_serverDlTable( "net_serverDlTable",
"", CVAR_GAME | CVAR_ARCHIVE, "pak names for which
download is provided, separated by ;" );
---- a/neo/d3xp/physics/Physics_AF.cpp
-+++ b/neo/d3xp/physics/Physics_AF.cpp
-@@ -3075,7 +3075,7 @@
- return;
- }
-
-- // seperate friction per contact is silly but it's fast and often looks
close enough
-+ // separate friction per contact is silly but it's fast and often looks
close enough
- if ( af_useImpulseFriction.GetBool() ) {
-
- impulse.SetData( 6, VECX_ALLOCA( 6 ) );
-@@ -6963,7 +6963,7 @@
- }
-
- if ( trees.Num() > 1 ) {
-- gameLocal.Warning( "Articulated figure has multiple
seperate tree structures for entity '%s' type '%s'.",
-+ gameLocal.Warning( "Articulated figure has multiple
separate tree structures for entity '%s' type '%s'.",
-
self->name.c_str(), self->GetType()->classname );
- }
-
---- a/neo/game/gamesys/SysCvar.cpp
-+++ b/neo/game/gamesys/SysCvar.cpp
-@@ -334,4 +334,4 @@
-
- idCVar net_serverDownload( "net_serverDownload",
"0", CVAR_GAME | CVAR_INTEGER | CVAR_ARCHIVE, "enable server
download redirects. 0: off 1: redirect to si_serverURL 2: use builtin download.
see net_serverDl cvars for configuration" );
- idCVar net_serverDlBaseURL( "net_serverDlBaseURL",
"", CVAR_GAME | CVAR_ARCHIVE, "base URL for the
download redirection" );
--idCVar net_serverDlTable( "net_serverDlTable",
"", CVAR_GAME | CVAR_ARCHIVE, "pak names for which
download is provided, seperated by ;" );
-+idCVar net_serverDlTable( "net_serverDlTable",
"", CVAR_GAME | CVAR_ARCHIVE, "pak names for which
download is provided, separated by ;" );
---- a/neo/game/physics/Physics_AF.cpp
-+++ b/neo/game/physics/Physics_AF.cpp
-@@ -3074,7 +3074,7 @@
- return;
- }
-
-- // seperate friction per contact is silly but it's fast and often looks
close enough
-+ // separate friction per contact is silly but it's fast and often looks
close enough
- if ( af_useImpulseFriction.GetBool() ) {
-
- impulse.SetData( 6, VECX_ALLOCA( 6 ) );
-@@ -6962,7 +6962,7 @@
- }
-
- if ( trees.Num() > 1 ) {
-- gameLocal.Warning( "Articulated figure has multiple
seperate tree structures for entity '%s' type '%s'.",
-+ gameLocal.Warning( "Articulated figure has multiple
separate tree structures for entity '%s' type '%s'.",
-
self->name.c_str(), self->GetType()->classname );
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index b4fbc9b..e537492 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01-changedatadir.patch
-02-spelling-errors.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/dhewm3.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
