[ioquake3] 57/59: d/p/Fix-mis-spellings-of-separating-as-seperating.patch: fix spellings

Simon McVittie smcv at debian.org
Wed Sep 21 19:57:12 UTC 2016 

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 56d9b718965389867652cd1695dbd2cbfdfe1f44
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 21 20:15:50 2016 +0100

    d/p/Fix-mis-spellings-of-separating-as-seperating.patch: fix spellings
---
 debian/changelog                                   |  2 +
 ...mis-spellings-of-separating-as-seperating.patch | 66 ++++++++++++++++++++++
 ...HLIBLDFLAGS-used-to-link-executables-only.patch |  8 +--
 ...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch |  4 +-
 ...-a-window-by-default-on-new-installations.patch |  4 +-
 debian/patches/series                              |  1 +
 6 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8bc6fe..4724ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ioquake3 (1.36+u20160914+dfsg1-1) UNRELEASED; urgency=medium
     - don't explicitly do a parallel build, it is the default
   * debian/rules: mark get-orig-source as a phony target
   * debian/rules: re-indent options
+  * d/p/Fix-mis-spellings-of-separating-as-seperating.patch:
+    fix spellings
 
  -- Simon McVittie <smcv at debian.org>  Wed, 21 Sep 2016 10:21:52 +0100
 
diff --git a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
new file mode 100644
index 0000000..55a5bef
--- /dev/null
+++ b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
@@ -0,0 +1,66 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 21 Sep 2016 20:15:01 +0100
+Subject: Fix mis-spellings of "separating" as "seperating"
+
+Found by Debian's Lintian tool.
+---
+ code/botlib/aasfile.h        | 4 ++--
+ code/botlib/be_aas_cluster.c | 2 +-
+ code/qcommon/cm_trace.c      | 2 +-
+ code/qcommon/common.c        | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/code/botlib/aasfile.h b/code/botlib/aasfile.h
+index 8f2fbf6..a0593df 100644
+--- a/code/botlib/aasfile.h
++++ b/code/botlib/aasfile.h
+@@ -65,8 +65,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ #define FACE_LADDER					2		//ladder
+ #define FACE_GROUND					4		//standing on ground when in this face
+ #define FACE_GAP					8		//gap in the ground
+-#define FACE_LIQUID					16		//face seperating two areas with liquid
+-#define FACE_LIQUIDSURFACE			32		//face seperating liquid and air
++#define FACE_LIQUID					16		//face separating two areas with liquid
++#define FACE_LIQUIDSURFACE			32		//face separating liquid and air
+ #define FACE_BRIDGE					64		//can walk over this face if bridge is closed
+ 
+ //area contents
+diff --git a/code/botlib/be_aas_cluster.c b/code/botlib/be_aas_cluster.c
+index 013e806..c2fed97 100644
+--- a/code/botlib/be_aas_cluster.c
++++ b/code/botlib/be_aas_cluster.c
+@@ -152,7 +152,7 @@ int AAS_UpdatePortal(int areanum, int clusternum)
+ 	{
+ 		//remove the cluster portal flag contents
+ 		aasworld.areasettings[areanum].contents &= ~AREACONTENTS_CLUSTERPORTAL;
+-		Log_Write("portal area %d is seperating more than two clusters\r\n", areanum);
++		Log_Write("portal area %d is separating more than two clusters\r\n", areanum);
+ 		return qfalse;
+ 	} //end else
+ 	if (aasworld.portalindexsize >= AAS_MAX_PORTALINDEXSIZE)
+diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
+index a4ac80a..e6ca055 100644
+--- a/code/qcommon/cm_trace.c
++++ b/code/qcommon/cm_trace.c
+@@ -1053,7 +1053,7 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t
+ 	}
+ 
+ 	//
+-	// find the point distances to the seperating plane
++	// find the point distances to the separating plane
+ 	// and the offset for the size of the box
+ 	//
+ 	node = cm.nodes + num;
+diff --git a/code/qcommon/common.c b/code/qcommon/common.c
+index 70a6b1b..80dd2c3 100644
+--- a/code/qcommon/common.c
++++ b/code/qcommon/common.c
+@@ -411,7 +411,7 @@ void Com_ParseCommandLine( char *commandLine ) {
+         if (*commandLine == '"') {
+             inq = !inq;
+         }
+-        // look for a + seperating character
++        // look for a + separating character
+         // if commandLine came from a file, we might have real line seperators
+         if ( (*commandLine == '+' && !inq) || *commandLine == '\n'  || *commandLine == '\r' ) {
+             if ( com_numConsoleLines == MAX_CONSOLE_LINES ) {
diff --git a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
index b9a4f18..4335ba1 100644
--- a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+++ b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
@@ -11,10 +11,10 @@ of security vulnerability.
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ab3dca6..dddf1d5 100644
+index 6594598..6c7272c 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -2051,7 +2051,7 @@ endif
+@@ -2071,7 +2071,7 @@ endif
  ifneq ($(USE_RENDERER_DLOPEN),0)
  $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
  	$(echo_cmd) "LD $@"
@@ -23,7 +23,7 @@ index ab3dca6..dddf1d5 100644
  		-o $@ $(Q3OBJ) \
  		$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
  
-@@ -2067,13 +2067,13 @@ $(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
+@@ -2087,13 +2087,13 @@ $(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
  else
  $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(LIBSDLMAIN)
  	$(echo_cmd) "LD $@"
@@ -39,7 +39,7 @@ index ab3dca6..dddf1d5 100644
  		-o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \
  		$(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
  endif
-@@ -2215,7 +2215,7 @@ endif
+@@ -2235,7 +2235,7 @@ endif
  
  $(B)/$(SERVERBIN)$(FULLBINEXT): $(Q3DOBJ)
  	$(echo_cmd) "LD $@"
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index e4b01e4..7572618 100644
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -16,10 +16,10 @@ commit or from metadata like the debian/changelog in Debian packages.
  5 files changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 1203517..ab3dca6 100644
+index fb7efd0..6594598 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1094,6 +1094,11 @@ else
+@@ -1098,6 +1098,11 @@ else
    STRIP_FLAG = -s
  endif
  
diff --git a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
index 042cc67..7dd5735 100644
--- a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
  	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
  	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
 diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 05cd40e..fd514e7 100644
+index 30803e2..c60ad40 100644
 --- a/code/renderergl2/tr_init.c
 +++ b/code/renderergl2/tr_init.c
-@@ -1189,8 +1189,8 @@ void R_Register( void )
+@@ -1186,8 +1186,8 @@ void R_Register( void )
  	ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
  	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
  	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
diff --git a/debian/patches/series b/debian/patches/series
index aacecdd..b5a608b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Run-in-a-window-by-default-on-new-installations.patch
 ui-reinstate-minimal-code-to-determine-whether-this-.patch
 Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
 Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+Fix-mis-spellings-of-separating-as-seperating.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git

More information about the Pkg-games-commits mailing list