Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch. Fix several typos in upstream code detected by lintian.

4 files changed, 171 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 7bccd2e5d..20079a66d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     separate .keyboard files for x2goagent and nxagent.
   * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't
     patch files that get removed during code reduction.
+  * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
+    Fix several typos in upstream code detected by lintian.
 
   * NX code reduction efforts (from 93Mb to 60Mb):
     - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/991_fix-hr-typos.full+lite.patch
new file mode 100644
index 000000000..4ac12a5ff
--- /dev/null
+++ b/debian/patches/991_fix-hr-typos.full+lite.patch
@@ -0,0 +1,94 @@
+--- 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
new file mode 100644
index 000000000..d06ea3f53
--- /dev/null
+++ b/debian/patches/991_fix-hr-typos.full.patch
@@ -0,0 +1,73 @@
+--- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
++++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
+@@ -729,7 +729,7 @@
+     for (i = 0; attr[i]; i += 2) {
+ 	if (!strcmp (attr[i], "driver")) driver = attr[i+1];
+ 	else if (!strcmp (attr[i], "screen")) screen = attr[i+1];
+-	else XML_WARNING("unkown device attribute: %s.", attr[i]);
++	else XML_WARNING("unknown device attribute: %s.", attr[i]);
+     }
+     if (driver && strcmp (driver, data->driverName))
+ 	data->ignoringDevice = data->inDevice;
+@@ -749,7 +749,7 @@
+     for (i = 0; attr[i]; i += 2) {
+ 	if (!strcmp (attr[i], "name")) name = attr[i+1];
+ 	else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
+-	else XML_WARNING("unkown application attribute: %s.", attr[i]);
++	else XML_WARNING("unknown application attribute: %s.", attr[i]);
+     }
+     if (exec && strcmp (exec, data->execName))
+ 	data->ignoringApp = data->inApp;
+@@ -762,7 +762,7 @@
+     for (i = 0; attr[i]; i += 2) {
+ 	if (!strcmp (attr[i], "name")) name = attr[i+1];
+ 	else if (!strcmp (attr[i], "value")) value = attr[i+1];
+-	else XML_WARNING("unkown option attribute: %s.", attr[i]);
++	else XML_WARNING("unknown option attribute: %s.", attr[i]);
+     }
+     if (!name) XML_WARNING1 ("name attribute missing in option.");
+     if (!value) XML_WARNING1 ("value attribute missing in option.");
+--- 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/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
++++ b/nx-X11/extras/Mesa/src/mesa/shader/slang/Include/InfoSink.h
+@@ -88,7 +88,7 @@
+         case EPrefixError:         append("ERROR: ");          break;

+         case EPrefixInternalError: append("INTERNAL ERROR: "); break;

+         case EPrefixUnimplemented: append("UNIMPLEMENTED: ");  break;

+-        default:                   append("UNKOWN ERROR: ");   break;

++        default:                   append("UNKNOWN ERROR: ");   break;

+         }

+     }

+     void location(TSourceLoc loc) {

+--- 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 c65f64578..0e6ec06e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -73,6 +73,8 @@
 606_nx-X11_build-on-aarch64.full.patch
 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
 990_fix-DEBUG-and-TEST-builds.full.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