[X2Go-Commits] [nx-libs] 07/08: Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 9c52824a88d97106182d455ddc5a2b4023c416c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 2 15:31:35 2015 +0100

    Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by the NX code reduction effort.
---
 debian/patches/991_fix-hr-typos.full.patch |   40 ----------------------------
 1 file changed, 40 deletions(-)

diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/991_fix-hr-typos.full.patch
index cc862a8..3836adf 100644
--- a/debian/patches/991_fix-hr-typos.full.patch
+++ b/debian/patches/991_fix-hr-typos.full.patch
@@ -1,35 +1,6 @@
 Description: Fix several typos in nx-X11
 Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
---- 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 @@
@@ -52,17 +23,6 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
        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 @@

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git