This is an automated email from the git hooks/post-receive script. olek-guest pushed a commit to branch master in repository cyphesis-cpp.
commit f6981c18a5430d1573189db245a33a867b5b3f8c Author: Olek Wojnar <[email protected]> Date: Tue Sep 6 21:51:44 2016 -0400 Fix typos --- debian/changelog | 3 +- debian/patches/fix-typos.patch | 273 +++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 276 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 539d6bf..a54b3e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ cyphesis-cpp (0.6.2-2) unstable; urgency=medium * Fix lintian override + * Add fix-typos.patch - -- Olek Wojnar <[email protected]> Tue, 06 Sep 2016 21:14:02 -0400 + -- Olek Wojnar <[email protected]> Tue, 06 Sep 2016 21:55:37 -0400 cyphesis-cpp (0.6.2-1) unstable; urgency=medium diff --git a/debian/patches/fix-typos.patch b/debian/patches/fix-typos.patch new file mode 100644 index 0000000..781b763 --- /dev/null +++ b/debian/patches/fix-typos.patch @@ -0,0 +1,273 @@ +Description: Fix typos + Courtesy of lintian, will not be needed after Cyphesis 0.6.2. +Origin: https://github.com/worldforge/cyphesis/pull/30 +Last-Update: 2016-09-06 + +--- a/server/Admin.cpp ++++ b/server/Admin.cpp +@@ -301,7 +301,7 @@ + res, getId()); + return; + } else { +- error(op, "Unknow object type set", res, getId()); ++ error(op, "Unknown object type set", res, getId()); + return; + } + } +--- a/rulesets/Py_Oplist.cpp ++++ b/rulesets/Py_Oplist.cpp +@@ -94,7 +94,7 @@ + } + return (PyObject*)res; + } +- PyErr_SetString(PyExc_TypeError, "Unkown other in Oplist.num_add"); ++ PyErr_SetString(PyExc_TypeError, "Unknown other in Oplist.num_add"); + return NULL; + } + +@@ -141,7 +141,7 @@ + Py_INCREF(self); + return (PyObject*)self; + } +- PyErr_SetString(PyExc_TypeError, "Unkown other in Oplist.num_inplace_add"); ++ PyErr_SetString(PyExc_TypeError, "Unknown other in Oplist.num_inplace_add"); + return NULL; + } + +--- a/rulesets/basic/mind/NPCMind.py ++++ b/rulesets/basic/mind/NPCMind.py +@@ -425,7 +425,7 @@ + if res: + return self.add_importance(res['sub'].id,'>',res['obj'].id) + else: +- return self.interlinguish_warning(op,say,"Unkown assertion") ++ return self.interlinguish_warning(op,say,"Unknown assertion") + def interlinguish_know_verb1_operation(self, op, say): + """Handle a sentence of the form 'know subject predicate object' + +--- a/rulesets/Py_Shape.cpp ++++ b/rulesets/Py_Shape.cpp +@@ -450,7 +450,7 @@ + } + #endif // NDEBUG + if (static_cast<size_t>(index) >= self->shape.s->size()) { +- PyErr_SetString(PyExc_IndexError, "Number of corners exceded"); ++ PyErr_SetString(PyExc_IndexError, "Number of corners exceeded"); + return 0; + } + PyShape * a = newPyArea(); +@@ -474,7 +474,7 @@ + } + #endif // NDEBUG + if (static_cast<size_t>(index) >= self->shape.s->size()) { +- PyErr_SetString(PyExc_IndexError, "Number of corners exceded"); ++ PyErr_SetString(PyExc_IndexError, "Number of corners exceeded"); + return 0; + } + PyPoint3D * v = newPyPoint3D(); +--- a/TODO ++++ b/TODO +@@ -633,7 +633,7 @@ + + Both sight_move and sight_create update the map via the Python API + when this could be more efficiently done in the C++ if the op +- handler wasn't overriden. Why not assume the python handler does not ++ handler wasn't overridden. Why not assume the python handler does not + override? + + The overall concept of overriding from scripts and also from handlers +@@ -1613,7 +1613,7 @@ + instead - move the specialisation into the listeners. + + Does sightFooOperation etc. in BaseMind.h have to be virtual? I think not. +-Yes it does, as its overriden in some client code. ++Yes it does, as its overridden in some client code. + + CONTAINS could be some kind of spatial set of buckets for efficiency + when doing collision detection, but if this is not to be true for all entities +--- a/common/globals.cpp ++++ b/common/globals.cpp +@@ -474,7 +474,7 @@ + + getinstallprefix(); + +- // Check if the config directory has been overriden at this point, as if ++ // Check if the config directory has been overridden at this point, as if + // it has, that will affect loading the main config. + readConfigItem("cyphesis", "confdir", etc_directory); + +@@ -554,7 +554,7 @@ + { + char * home = getenv("HOME"); + +- // Write out any changes that have been overriden at user scope. It ++ // Write out any changes that have been overridden at user scope. It + // may be a good idea to do this at shutdown. + if (home != NULL) { + global_conf->writeToFile(std::string(home) + "/.cyphesis.vconf", varconf::USER); +--- a/configure.ac ++++ b/configure.ac +@@ -458,7 +458,7 @@ + ],[ $READLINE_LIBS ] + ) + +-AC_MSG_CHECKING([whether tar allows permissions to be overriden]) ++AC_MSG_CHECKING([whether tar allows permissions to be overridden]) + if tar cf /dev/null --mode o+rX /dev/null 2> /dev/null ; then + TAR_PERM_FLAGS="--mode o+rX" + AC_MSG_RESULT([yes]) +--- a/man/cyclient.1 ++++ b/man/cyclient.1 +@@ -25,7 +25,7 @@ + .SS "CLIENT OPTIONS" + .PP + The following options are present in the client section of the config file, +-and overriden by specifying the client section name on the command line. ++and overridden by specifying the client section name on the command line. + .TP + \fBpackage="define_world" \fR + Python package which contains the client function. +@@ -40,7 +40,7 @@ + .SS "SERVER OPTIONS" + .PP + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. These options apply to the server, but are also required + by the client to ensure that the client can connect. + .TP +--- a/man/cyclient.sgml ++++ b/man/cyclient.sgml +@@ -36,7 +36,7 @@ + <refsect2><title>Client Options</title> + <para> + The following options are present in the client section of the config file, +-and overriden by specifying the client section name on the command line. ++and overridden by specifying the client section name on the command line. + </para> + <variablelist> + +@@ -78,7 +78,7 @@ + <refsect2><title>Server Options</title> + <para> + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. These options apply to the server, but are also required + by the client to ensure that the client can connect. + </para> +--- a/man/cycmd.1 ++++ b/man/cycmd.1 +@@ -25,7 +25,7 @@ + .SS "CLIENT OPTIONS" + .PP + The following options used by \fBcycmd\fR are present in the +-client section of the config file, and overriden by specifying the client ++client section of the config file, and overridden by specifying the client + section name on the command line. + .TP + \fBserverhost=hostname \fR +@@ -36,7 +36,7 @@ + .SS "SERVER OPTIONS" + .PP + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. These options apply to the server, but are also required + by the client to ensure that the client can connect. + .TP +@@ -230,7 +230,7 @@ + .PP + The third example shows server monitoring being enable, followed by information + of a series of in-game operations. The flow of messages in while monitoring the +-server can be large. In order to supress the flow, the ++server can be large. In order to suppress the flow, the + \fBunmonitor\fR command must be used. + + .nf +--- a/man/cycmd.sgml ++++ b/man/cycmd.sgml +@@ -36,7 +36,7 @@ + <refsect2><title>Client Options</title> + <para> + The following options used by <command>cycmd</command> are present in the +-client section of the config file, and overriden by specifying the client ++client section of the config file, and overridden by specifying the client + section name on the command line. + </para> + <variablelist> +@@ -62,7 +62,7 @@ + <refsect2><title>Server Options</title> + <para> + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. These options apply to the server, but are also required + by the client to ensure that the client can connect. + </para> +--- a/man/cyphesis.1 ++++ b/man/cyphesis.1 +@@ -19,7 +19,7 @@ + .SS "SERVER OPTIONS" + .PP + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. + .TP + \fBdirectory="/path/to/server/data"\fR +--- a/man/cyphesis.sgml ++++ b/man/cyphesis.sgml +@@ -34,7 +34,7 @@ + <refsect2><title>Server Options</title> + <para> + The following options are present in the cyphesis section of the config +-file, and overriden by specifying the cyphesis section name on the ++file, and overridden by specifying the cyphesis section name on the + command line. + </para> + <variablelist> +--- a/rulesets/Creator.cpp ++++ b/rulesets/Creator.cpp +@@ -203,7 +203,7 @@ + + void Creator::mindLookOperation(const Operation & op, OpVector & res) + { +- // This overriden version allows the Creator to search the world for ++ // This overridden version allows the Creator to search the world for + // entities by type or by name + debug(std::cout << "Got look up from prived mind from [" << op->getFrom() + << "] to [" << op->getTo() << "]" << std::endl << std::flush;); +--- a/server/EntityBuilder.cpp ++++ b/server/EntityBuilder.cpp +@@ -176,7 +176,7 @@ + // If a property is in the class it won't have been installed + // as setAttr() checks + prop->install(thing, J->first); +- // The property will have been applied if it has an overriden ++ // The property will have been applied if it has an overridden + // value, so we only apply it the value is still default. + if (attrs.find(J->first) == attrs.end()) { + prop->apply(thing); +--- a/server/EntityRuleHandler.cpp ++++ b/server/EntityRuleHandler.cpp +@@ -110,7 +110,7 @@ + backup_class_attributes = factory->m_classAttributes; + + // Copy the defaults from the parent. In populateEntityFactory this may be +- // overriden with the defaults for this class. ++ // overridden with the defaults for this class. + if (factory->m_parent != 0) { + factory->m_attributes = factory->m_parent->m_attributes; + } else { +--- a/tools/AdminClient.cpp ++++ b/tools/AdminClient.cpp +@@ -107,7 +107,7 @@ + const MapType & rule) + { + if (m_uploadedRules.find(id) != m_uploadedRules.end()) { +- std::cout << "Overriden rule " << id << " ignored." ++ std::cout << "Overridden rule " << id << " ignored." + << std::endl << std::flush; + + return -1; diff --git a/debian/patches/series b/debian/patches/series index 4d8dd97..05effad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ do-not-register-with-metaserver.patch explicit-integer-instantiation.patch update-for-wfmath-api-change.patch remove-obsolete-buildTime-buildDate-system.patch +fix-typos.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/cyphesis-cpp.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
