[darkplaces] 01/02: Fix another misspelled word (mimicking)
Simon McVittie
smcv at debian.org
Sun Jun 18 16:56:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository darkplaces.
commit 988a48d3ff75a75453f4cf2b444103272f33a141
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jun 18 17:42:28 2017 +0100
Fix another misspelled word (mimicking)
---
debian/changelog | 1 +
...-SSE-only-software-rasterizer-on-non-x86-.patch | 2 +-
...sn-t-arguemen.patch => Fix-various-typos.patch} | 33 ++++++++++++++++++++--
debian/patches/series | 2 +-
4 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 439a6c0..eecd328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
darkplaces (0~20140513+svn12208-5) UNRELEASED; urgency=medium
* Increase debhelper compat level to 10 for parallel build
+ * Fix another misspelled word (mimicking)
-- Simon McVittie <smcv at debian.org> Wed, 22 Feb 2017 10:21:22 +0000
diff --git a/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch b/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
index 66e70cb..d790863 100644
--- a/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
+++ b/debian/patches/Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
@@ -863,7 +863,7 @@ index bb57bca..70ce90d 100644
case RENDERPATH_D3D9:
case RENDERPATH_D3D10:
diff --git a/vid_shared.c b/vid_shared.c
-index 7c321c2..6cfaf0d 100644
+index eef34cc..27b7d42 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1711,7 +1711,7 @@ static dllhandle_t xinputdll_dll = NULL;
diff --git a/debian/patches/Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch b/debian/patches/Fix-various-typos.patch
similarity index 88%
rename from debian/patches/Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
rename to debian/patches/Fix-various-typos.patch
index 22825c9..2a49d94 100644
--- a/debian/patches/Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
+++ b/debian/patches/Fix-various-typos.patch
@@ -1,7 +1,6 @@
From: Simon McVittie <smcv at debian.org>
Date: Fri, 20 Jan 2012 09:34:00 +0000
-Subject: Fix various typos: dont -> don't, doesnt -> doesn't,
- arguements -> arguments
+Subject: Fix various typos
Picked up by Debian's Lintian package-checking tool.
@@ -10,6 +9,7 @@ Forwarded: no
---
clvm_cmds.c | 2 +-
cmd.c | 2 +-
+ curves.c | 2 +-
dpdefs/csprogsdefs.qc | 4 ++--
gl_draw.c | 2 +-
gl_rmain.c | 2 +-
@@ -25,9 +25,10 @@ Forwarded: no
sys.h | 2 +-
todo | 4 ++--
vid_sdl.c | 2 +-
+ vid_shared.c | 2 +-
vid_wgl.c | 2 +-
world.c | 4 ++--
- 19 files changed, 28 insertions(+), 28 deletions(-)
+ 21 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/clvm_cmds.c b/clvm_cmds.c
index 9d41dda..d739376 100644
@@ -55,6 +56,19 @@ index cab160b..28c722d 100644
break;
}
memcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token, l);
+diff --git a/curves.c b/curves.c
+index cf7569d..e6ade77 100644
+--- a/curves.c
++++ b/curves.c
+@@ -159,7 +159,7 @@ static int Q3PatchTesselation(float largestsquared3xcurvearea, float tolerance)
+ static float Squared3xCurveArea(const float *a, const float *control, const float *b, int components)
+ {
+ #if 0
+- // mimicing the old behaviour with the new code...
++ // mimicking the old behaviour with the new code...
+
+ float deviation;
+ float quartercurvearea = 0;
diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
index 18a8920..02d0b1d 100644
--- a/dpdefs/csprogsdefs.qc
@@ -306,6 +320,19 @@ index 942cbdd..bb57bca 100644
#ifdef WIN32
#include "resource.h"
#include <SDL_syswm.h>
+diff --git a/vid_shared.c b/vid_shared.c
+index 7c321c2..eef34cc 100644
+--- a/vid_shared.c
++++ b/vid_shared.c
+@@ -184,7 +184,7 @@ cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics pro
+ cvar_t vid_sRGB = {CVAR_SAVE, "vid_sRGB", "0", "if hardware is capable, modify rendering to be gamma corrected for the sRGB color standard (computer monitors, TVs), recommended"};
+ cvar_t vid_sRGB_fallback = {CVAR_SAVE, "vid_sRGB_fallback", "0", "do an approximate sRGB fallback if not properly supported by hardware (2: also use the fallback if framebuffer is 8bit, 3: always use the fallback even if sRGB is supported)"};
+
+-cvar_t vid_touchscreen = {0, "vid_touchscreen", "0", "Use touchscreen-style input (no mouse grab, track mouse motion only while button is down, screen areas for mimicing joystick axes and buttons"};
++cvar_t vid_touchscreen = {0, "vid_touchscreen", "0", "Use touchscreen-style input (no mouse grab, track mouse motion only while button is down, screen areas for mimicking joystick axes and buttons"};
+ cvar_t vid_touchscreen_showkeyboard = {0, "vid_touchscreen_showkeyboard", "0", "shows the platform's screen keyboard for text entry, can be set by csqc or menu qc if it wants to receive text input, does nothing if the platform has no screen keyboard"};
+ cvar_t vid_touchscreen_supportshowkeyboard = {CVAR_READONLY, "vid_touchscreen_supportshowkeyboard", "0", "indicates if the platform supports a virtual keyboard"};
+ cvar_t vid_stick_mouse = {CVAR_SAVE, "vid_stick_mouse", "0", "have the mouse stuck in the center of the screen" };
diff --git a/vid_wgl.c b/vid_wgl.c
index 24379fb..92db3ca 100644
--- a/vid_wgl.c
diff --git a/debian/patches/series b/debian/patches/series
index 18844c1..dc4c6ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,6 @@ Add-support-for-forcing-d0_blind_id-and-d0_rijndael-.patch
Add-support-for-disabling-libavw.patch
Disable-dlopen-support-and-warn-if-it-gets-compiled-.patch
Fix-OS-detection-of-darkplaces-makefile-to-not-think.patch
-Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
+Fix-various-typos.patch
Don-t-build-SSE-only-software-rasterizer-on-non-x86-.patch
Disable-gpu-skinning-for-skeletal-models.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkplaces.git
More information about the Pkg-games-commits
mailing list