[X2Go-Commits] [nx-libs] 13/14: Fix several typos in nxcomp.
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 13 13:59:14 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 23fb617551f7d89dbc1fc9e216b7f12d2936e1a2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Feb 13 13:43:54 2015 +0100
Fix several typos in nxcomp.
Former patch file names:
991_fix-hr-typos.full+lite.patch
991_fix-hr-typos.full.patch
---
debian/patches/991_fix-hr-typos.full+lite.patch | 97 ---------------------
debian/patches/991_fix-hr-typos.full.patch | 36 --------
debian/patches/series | 2 -
nx-X11/ChangeLog.X.org | 2 +-
nx-X11/extras/Mesa/src/mesa/main/debug.c | 2 +-
nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c | 2 +-
nxcomp/CHANGELOG | 2 +-
nxcomp/ClientReadBuffer.cpp | 2 +-
nxcomp/EncodeBuffer.cpp | 4 +-
nxcomp/GenericChannel.cpp | 2 +-
nxcomp/ProxyReadBuffer.cpp | 2 +-
nxcomp/ServerReadBuffer.cpp | 2 +-
nxcomp/Transport.h | 2 +-
nxcomp/Types.h | 2 +-
14 files changed, 12 insertions(+), 147 deletions(-)
diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/991_fix-hr-typos.full+lite.patch
deleted file mode 100644
index 4ff1846..0000000
--- a/debian/patches/991_fix-hr-typos.full+lite.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fix several typos in nxcomp
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/nxcomp/CHANGELOG
-+++ b/nxcomp/CHANGELOG
-@@ -668,7 +668,7 @@
-
- nxcomp-2.0.0-69
-
--- Changed the format of the persistent cache to accomodate the new
-+- Changed the format of the persistent cache to accommodate the new
- encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
- should be still loaded and saved correctly when connected to and
- old version of the library.
---- a/nxcomp/ClientReadBuffer.cpp
-+++ b/nxcomp/ClientReadBuffer.cpp
-@@ -29,7 +29,7 @@
- //
- // Even if the pending data is not
- // enough to make a complete message,
-- // resize the buffer to accomodate
-+ // resize the buffer to accommodate
- // it all.
- //
-
---- a/nxcomp/EncodeBuffer.cpp
-+++ b/nxcomp/EncodeBuffer.cpp
-@@ -505,12 +505,12 @@
- {
- #ifdef PANIC
- *logofs << "EncodeBuffer: PANIC! Error in context [C] "
-- << "growing buffer to accomodate " << numBytes
-+ << "growing buffer to accommodate " << numBytes
- << " bytes .\n" << logofs_flush;
- #endif
-
- cerr << "Error" << ": Error in context [C] "
-- << "growing encode buffer to accomodate "
-+ << "growing encode buffer to accommodate "
- << numBytes << " bytes.\n";
-
- HandleAbort();
---- a/nxcomp/GenericChannel.cpp
-+++ b/nxcomp/GenericChannel.cpp
-@@ -210,7 +210,7 @@
- // All data has been read from the read buffer.
- // We still need to mark the end of the encode
- // buffer just before sending the frame. This
-- // allows us to accomodate multiple reads in
-+ // allows us to accommodate multiple reads in
- // a single frame.
- //
-
---- a/nxcomp/ProxyReadBuffer.cpp
-+++ b/nxcomp/ProxyReadBuffer.cpp
-@@ -50,7 +50,7 @@
- //
- // Even if the readable data is not
- // enough to make a complete message,
-- // resize the buffer to accomodate
-+ // resize the buffer to accommodate
- // it all.
- //
-
---- a/nxcomp/ServerReadBuffer.cpp
-+++ b/nxcomp/ServerReadBuffer.cpp
-@@ -46,7 +46,7 @@
- //
- // Even if the readable data is not
- // enough to make a complete message,
-- // resize the buffer to accomodate
-+ // resize the buffer to accommodate
- // it all.
- //
-
---- a/nxcomp/Transport.h
-+++ b/nxcomp/Transport.h
-@@ -226,7 +226,7 @@
- protected:
-
- //
-- // Make room in the buffer to accomodate
-+ // Make room in the buffer to accommodate
- // at least size bytes.
- //
-
---- a/nxcomp/Types.h
-+++ b/nxcomp/Types.h
-@@ -179,7 +179,7 @@
- typedef list < int > T_list;
-
- //
--// Used to accomodate data to be read and
-+// Used to accommodate data to be read and
- // written to a socket.
- //
-
diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch
deleted file mode 100644
index 3836adf..0000000
--- a/debian/patches/991_fix-hr-typos.full.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix several typos in nx-X11
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
---- a/nx-X11/extras/Mesa/src/mesa/main/debug.c
-+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
-@@ -43,7 +43,7 @@
- "GL_QUAD_STRIP",
- "GL_POLYGON",
- "outside begin/end",
-- "inside unkown primitive",
-+ "inside unknown primitive",
- "unknown state"
- };
-
---- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
-+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
-@@ -4106,7 +4106,7 @@
- if (*inst++ != REVISION) {
- _mesa_set_program_error (ctx, 0, "Grammar version mismatch");
- _mesa_error(ctx, GL_INVALID_OPERATION,
-- "glProgramStringARB(Grammar verison mismatch)");
-+ "glProgramStringARB(Grammar version mismatch)");
- err = GL_TRUE;
- }
- else {
---- a/nx-X11/ChangeLog.X.org
-+++ b/nx-X11/ChangeLog.X.org
-@@ -12733,7 +12733,7 @@
- * programs/xkill/xkill.c: (get_window_id):
- Changed cursor for the 'kill' action from XC_draped_box to
- XC_Pirate. If you don't like it we can change it back
-- (original author unkown).
-+ (original author unknown).
-
- * programs/xman/vendor.h:
- Added 'pic' to the man page rendering command pipeline
diff --git a/debian/patches/series b/debian/patches/series
index 76709c4..3ee62f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
-991_fix-hr-typos.full+lite.patch
-991_fix-hr-typos.full.patch
999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
016_nx-X11_install-location.debian.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
diff --git a/nx-X11/ChangeLog.X.org b/nx-X11/ChangeLog.X.org
index bb0bbb0..5c49bba 100644
--- a/nx-X11/ChangeLog.X.org
+++ b/nx-X11/ChangeLog.X.org
@@ -12733,7 +12733,7 @@ Mon Jan 3 12:45:10 2005 Søren Sandmann <sandmann at redhat.com>
* programs/xkill/xkill.c: (get_window_id):
Changed cursor for the 'kill' action from XC_draped_box to
XC_Pirate. If you don't like it we can change it back
- (original author unkown).
+ (original author unknown).
* programs/xman/vendor.h:
Added 'pic' to the man page rendering command pipeline
diff --git a/nx-X11/extras/Mesa/src/mesa/main/debug.c b/nx-X11/extras/Mesa/src/mesa/main/debug.c
index edc32b1..43b1192 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/debug.c
+++ b/nx-X11/extras/Mesa/src/mesa/main/debug.c
@@ -43,7 +43,7 @@ const char *_mesa_prim_name[GL_POLYGON+4] = {
"GL_QUAD_STRIP",
"GL_POLYGON",
"outside begin/end",
- "inside unkown primitive",
+ "inside unknown primitive",
"unknown state"
};
diff --git a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
index ed1cbd9..c998f7c 100644
--- a/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
+++ b/nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c
@@ -4106,7 +4106,7 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
if (*inst++ != REVISION) {
_mesa_set_program_error (ctx, 0, "Grammar version mismatch");
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glProgramStringARB(Grammar verison mismatch)");
+ "glProgramStringARB(Grammar version mismatch)");
err = GL_TRUE;
}
else {
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index b7ef0d9..b0323d4 100644
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -668,7 +668,7 @@ nxcomp-2.0.0-70
nxcomp-2.0.0-69
-- Changed the format of the persistent cache to accomodate the new
+- Changed the format of the persistent cache to accommodate the new
encoding of the render opcodes. Caches from the 1.4.0 and 1.5.0
should be still loaded and saved correctly when connected to and
old version of the library.
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/ClientReadBuffer.cpp
index b32033b..14aca32 100644
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/ClientReadBuffer.cpp
@@ -29,7 +29,7 @@ unsigned int ClientReadBuffer::suggestedLength(unsigned int pendingLength)
//
// Even if the pending data is not
// enough to make a complete message,
- // resize the buffer to accomodate
+ // resize the buffer to accommodate
// it all.
//
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/EncodeBuffer.cpp
index 466a1d7..12a5718 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/EncodeBuffer.cpp
@@ -505,12 +505,12 @@ void EncodeBuffer::growBuffer(unsigned int numBytes)
{
#ifdef PANIC
*logofs << "EncodeBuffer: PANIC! Error in context [C] "
- << "growing buffer to accomodate " << numBytes
+ << "growing buffer to accommodate " << numBytes
<< " bytes .\n" << logofs_flush;
#endif
cerr << "Error" << ": Error in context [C] "
- << "growing encode buffer to accomodate "
+ << "growing encode buffer to accommodate "
<< numBytes << " bytes.\n";
HandleAbort();
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/GenericChannel.cpp
index 641ad36..bf72bf0 100644
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/GenericChannel.cpp
@@ -210,7 +210,7 @@ int GenericChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *
// All data has been read from the read buffer.
// We still need to mark the end of the encode
// buffer just before sending the frame. This
- // allows us to accomodate multiple reads in
+ // allows us to accommodate multiple reads in
// a single frame.
//
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/ProxyReadBuffer.cpp
index b0de149..99c3cba 100644
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/ProxyReadBuffer.cpp
@@ -50,7 +50,7 @@ unsigned int ProxyReadBuffer::suggestedLength(unsigned int pendingLength)
//
// Even if the readable data is not
// enough to make a complete message,
- // resize the buffer to accomodate
+ // resize the buffer to accommodate
// it all.
//
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/ServerReadBuffer.cpp
index 53c1dec..96c146b 100644
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/ServerReadBuffer.cpp
@@ -46,7 +46,7 @@ unsigned int ServerReadBuffer::suggestedLength(unsigned int pendingLength)
//
// Even if the readable data is not
// enough to make a complete message,
- // resize the buffer to accomodate
+ // resize the buffer to accommodate
// it all.
//
diff --git a/nxcomp/Transport.h b/nxcomp/Transport.h
index 2f313b2..a2efa52 100644
--- a/nxcomp/Transport.h
+++ b/nxcomp/Transport.h
@@ -226,7 +226,7 @@ class Transport
protected:
//
- // Make room in the buffer to accomodate
+ // Make room in the buffer to accommodate
// at least size bytes.
//
diff --git a/nxcomp/Types.h b/nxcomp/Types.h
index b3fe40e..b750612 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/Types.h
@@ -179,7 +179,7 @@ typedef set < File *, T_older > T_files;
typedef list < int > T_list;
//
-// Used to accomodate data to be read and
+// Used to accommodate data to be read and
// written to a socket.
//
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list