Fix several typos in nxcomp.

debian/patches/991_fix-hr-typos.full+lite.patch

-Description: Fix several typos in nxcomp
-Author: Mike Gabriel <mike.gabriel@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.
- //
- 

debian/patches/991_fix-hr-typos.full.patch

-Description: Fix several typos in nx-X11
-Author: Mike Gabriel <mike.gabriel@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

debian/patches/series

 #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

nx-X11/ChangeLog.X.org

@@ -12733,7 +12733,7 @@ Mon Jan  3 12:45:10 2005  Søren Sandmann  <sandmann@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

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"
 };
 

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 {

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.

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.
   //
 

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();

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.
   //
 

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.
   //
 

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.
   //
 

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.
   //
 

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.
 //