aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/991_fix-hr-typos.full+lite.patch97
-rw-r--r--debian/patches/991_fix-hr-typos.full.patch36
-rw-r--r--debian/patches/series2
3 files changed, 0 insertions, 135 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 4ff18462e..000000000
--- 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@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 3836adf55..000000000
--- 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@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 76709c4ad..3ee62f39c 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