[Python-modules-commits] r23586 - in packages/gamera/trunk/debian (3 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sun Feb 24 23:06:34 UTC 2013
Date: Sunday, February 24, 2013 @ 23:06:32
Author: jwilk
Revision: 23586
Add patch to fix spelling mistakes.
Added:
packages/gamera/trunk/debian/patches/fix-typos.diff
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/patches/series
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2013-02-24 22:47:50 UTC (rev 23585)
+++ packages/gamera/trunk/debian/changelog 2013-02-24 23:06:32 UTC (rev 23586)
@@ -7,8 +7,10 @@
+ Bump minimum required Python version to 2.5.
+ Add gamera/__compiletime_config__.py to debian/clean.
* Bump standards version to 3.9.4 (no changes needed).
+ * Add patch to fix spelling mistakes.
+ (fix-typos.diff)
- -- Jakub Wilk <jwilk at debian.org> Sun, 24 Feb 2013 23:47:31 +0100
+ -- Jakub Wilk <jwilk at debian.org> Mon, 25 Feb 2013 00:05:56 +0100
gamera (3.3.3-2) unstable; urgency=low
Added: packages/gamera/trunk/debian/patches/fix-typos.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-typos.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/fix-typos.diff 2013-02-24 23:06:32 UTC (rev 23586)
@@ -0,0 +1,468 @@
+Description: fix spelling mistakes
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+Last-Update: 2013-02-25
+
+--- a/doc/src/ga_optimization.txt
++++ b/doc/src/ga_optimization.txt
+@@ -8,7 +8,7 @@
+ Feature Selection, Weighting and Genetic Algorithms
+ '''''''''''''''''''''''''''''''''''''''''''''''''''
+
+-Feature selection is the techique of selecting a subset of good features
++Feature selection is the technique of selecting a subset of good features
+ out of a larger featureset to obtain the features which are suitable
+ for the best possible classification. Feature weighting is a generalization
+ of feature selection with real-valued weights between [0,1] instead of the
+@@ -81,7 +81,7 @@
+
+ The used feature set can be modified with **Classifier -> Change feature set**.
+ With the menu entries **Classifier -> Reset selections** and
+-**Classifier -> Reset weights** it is possible to discard already choosen
++**Classifier -> Reset weights** it is possible to discard already chosen
+ optimizations.
+
+ .. __: gamera_xml.html
+--- a/gamera/gui/gaoptimizer/SettingsPanel.py
++++ b/gamera/gui/gaoptimizer/SettingsPanel.py
+@@ -301,7 +301,7 @@
+ elif expertWidget.GetName() == "randomSelection":
+ selection.setRandomSelection()
+ else:
+- raise RuntimeError("Unknown selection method choosen")
++ raise RuntimeError("Unknown selection method chosen")
+
+ # Crossover GA settings
+ cross = knnga.GACrossover()
+@@ -323,10 +323,10 @@
+ cross.setHypercubeCrossover(self.frame.classifier.num_features, 0.0, 1.0, \
+ self.crossoverPanel.hypercubeCrossoverAlpha.GetValue())
+ else:
+- raise RuntimeError("Unknown crossover method choosen")
++ raise RuntimeError("Unknown crossover method chosen")
+ crossOpSet = True
+ if not crossOpSet:
+- raise RuntimeError("At least one crossover operator must be choosen")
++ raise RuntimeError("At least one crossover operator must be chosen")
+
+ # Mutation GA settings
+ muta = knnga.GAMutation()
+@@ -347,10 +347,10 @@
+ self.mutationPanel.gaussMutationSigma.GetValue(), \
+ self.mutationPanel.gaussMutationPchance.GetValue())
+ else:
+- raise RuntimeError("Unknown mutation method choosen")
++ raise RuntimeError("Unknown mutation method chosen")
+ mutOpSet = True
+ if not mutOpSet:
+- raise RuntimeError("At least one mutation operator must be choosen")
++ raise RuntimeError("At least one mutation operator must be chosen")
+
+ # Replacement GA settings
+ replacement = knnga.GAReplacement()
+@@ -364,7 +364,7 @@
+ elif expertWidget.GetName() == "SSGAdetTournament":
+ replacement.setSSGAdetTournament(self.replacementPanel.ssgaDetTourTsize.GetValue())
+ else:
+- raise RuntimeError("Unknown replacement method choosen")
++ raise RuntimeError("Unknown replacement method chosen")
+
+ # Stop Criteria GA settings
+ stop = knnga.GAStopCriteria()
+@@ -382,10 +382,10 @@
+ stop.setSteadyStateStop(self.stopCriteriaPanel.steadyContinueMin.GetValue(), \
+ self.stopCriteriaPanel.steadyContinueNoChange.GetValue())
+ else:
+- raise RuntimeError("Unknown stop criteria choosen")
++ raise RuntimeError("Unknown stop criteria chosen")
+ stopCritSet = True
+ if not stopCritSet:
+- raise RuntimeError("At least one stop criteria must be choosen")
++ raise RuntimeError("At least one stop criteria must be chosen")
+
+ # Parallelization GA settings
+ para = knnga.GAParallelization()
+--- a/include/vigra/numerictraits.hxx
++++ b/include/vigra/numerictraits.hxx
+@@ -103,7 +103,7 @@
+ The return type of this function can not be 'unsigned char' because
+ the summation would very likely overflow. Since we know the source
+ type, we can easily choose 'int' as an appropriate return type.
+- Likewise, we would have choosen 'float' if we had to sum a
++ Likewise, we would have chosen 'float' if we had to sum a
+ sequence of floats. If we want to make this
+ algorithm generic, we would like to derive the appropriate return
+ type automatically. This can be done with NumericTraits.
+--- a/src/knngamodule.cpp
++++ b/src/knngamodule.cpp
+@@ -496,7 +496,7 @@
+ "The ``GASelection`` constructor creates a new settings object "
+ "for the GA-optimization which specifies the used individuals selection method. "
+ "This object can later be used in an ``GAOptimization``-object. \n\n"
+- "Only one selection method can be choosen. Multiple settings will "
++ "Only one selection method can be chosen. Multiple settings will "
+ "override each other.";
+
+ PyType_Ready(&GASelectionType);
+@@ -556,9 +556,9 @@
+ " the number of used features. Usually this value is set to "
+ "``classifier.num_features``.\n"
+ "double *min* (optional)\n"
+- " the minimum value which is allowed in an allel (usually 0.0)\n"
++ " the minimum value which is allowed in an allele (usually 0.0)\n"
+ "double *max* (optional)\n"
+- " the maximum value which is allowed in an allel (usually 1.0)\n"
++ " the maximum value which is allowed in an allele (usually 1.0)\n"
+ "double *eta* (optional)\n"
+ " the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
+ },
+@@ -573,9 +573,9 @@
+ " the number of used features. Usually this value is set to "
+ "``classifier.num_features``.\n"
+ "double *min* (optional)\n"
+- " the minimum value which is allowed in an allel (usually 0.0)\n"
++ " the minimum value which is allowed in an allele (usually 0.0)\n"
+ "double *max* (optional)\n"
+- " the maximum value which is allowed in an allel (usually 1.0)\n"
++ " the maximum value which is allowed in an allele (usually 1.0)\n"
+ "double *alpha* (optional)\n"
+ " the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
+ },
+@@ -590,9 +590,9 @@
+ " the number of used features. Usually this value is set to "
+ "``classifier.num_features``.\n"
+ "double *min* (optional)\n"
+- " the minimum value which is allowed in an allel (usually 0.0)\n"
++ " the minimum value which is allowed in an allele (usually 0.0)\n"
+ "double *max* (optional)\n"
+- " the maximum value which is allowed in an allel (usually 1.0)\n"
++ " the maximum value which is allowed in an allele (usually 1.0)\n"
+ "double *alpha* (optional)\n"
+ " the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
+ },
+@@ -811,7 +811,7 @@
+ "individuals. This means that this operator only effects "
+ "feature selection.\n\n"
+ "double *rate* (optional)\n"
+- " the probability for mutation of an allel (should be in [0,1])\n"
++ " the probability for mutation of an allele (should be in [0,1])\n"
+ "bool *normalize* (optional)\n"
+ " if true ``rate/chromosomeSize`` is used"
+ },
+@@ -825,14 +825,14 @@
+ " the number of used features. Usually this value is set to "
+ "``classifier.num_features``.\n"
+ "double *min*\n"
+- " the minimum value which is allowed in an allel (usually 0.0)\n"
++ " the minimum value which is allowed in an allele (usually 0.0)\n"
+ "double *max*\n"
+- " the maximum value which is allowed in an allel (usually 1.0)\n"
++ " the maximum value which is allowed in an allele (usually 1.0)\n"
+ "double *sigma*\n"
+ " the standard deviation of the gaussian distribution. This "
+- "paramater determines the strength of the mutation.\n"
++ "parameter determines the strength of the mutation.\n"
+ "double *rate*\n"
+- " the probability for mutating an allel (should be in [0,1])\n"
++ " the probability for mutating an allele (should be in [0,1])\n"
+ },
+ { NULL }
+ };
+@@ -1136,7 +1136,7 @@
+ "The ``GAReplacement`` constructor creates a new settings object "
+ "for the GA-optimization which specifies the used replacement method. "
+ "This object can later be used in an ``GAOptimization``-object. \n\n"
+- "Only one replacement method can be choosen. Multiple settings will "
++ "Only one replacement method can be chosen. Multiple settings will "
+ "override each other.";
+
+ PyType_Ready(&GAReplacementType);
+--- a/src/eodev/utils/eoParser.cpp
++++ b/src/eodev/utils/eoParser.cpp
+@@ -82,7 +82,7 @@
+ programDescription( _programDescription),
+ needHelpMessage( false ),
+ needHelp(false, "help", "Prints this message", 'h'),
+- stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unkown param entered", '\0')
++ stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unknown param entered", '\0')
+ {
+ // need to process the param file first
+ // if we want command-line to have highest priority
+--- a/doc/src/conversion.txt
++++ b/doc/src/conversion.txt
+@@ -197,7 +197,7 @@
+ :Author: Michael Droettboom, Karl MacMillan, and Christoph Dalitz
+
+
+-Converts the given image to an RGB image according to teh following rules:
++Converts the given image to an RGB image according to the following rules:
+
+ - for ONEBIT images, 0 is mapped to (255,255,255) and everything else to (0,0,0)
+ - for GREYSCALE and GREY16 images, R=G=B
+--- a/gamera/plugins/image_conversion.py
++++ b/gamera/plugins/image_conversion.py
+@@ -23,7 +23,7 @@
+
+ class to_rgb(PluginFunction):
+ """
+- Converts the given image to an RGB image according to teh following rules:
++ Converts the given image to an RGB image according to the following rules:
+
+ - for ONEBIT images, 0 is mapped to (255,255,255) and everything else to (0,0,0)
+ - for GREYSCALE and GREY16 images, R=G=B
+--- a/INSTALL
++++ b/INSTALL
+@@ -38,7 +38,7 @@
+
+ The Python 2.6 binary from python.org has been built with
+ a version of MS Visual Studio that causes problems when extensions
+- are compiled with Mingw32. The reason is an errenous
++ are compiled with Mingw32. The reason is an erroneous
+ file ``libmsvcr90.a`` coming with Mingw32. To fix it, you can
+ recreate the file from the DLL ``msvcr90.dll`` that comes with
+ Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
+@@ -156,7 +156,7 @@
+ python setup.py build
+ sudo python setup.py install
+
+-By default, parallelization of the genetica algorithms is only compiled
++By default, parallelization of the genetic algorithms is only compiled
+ into Gamera under Linux and with gcc version > 4.2, because we could only
+ get it running in this environment. If you are sure that you have unbroken
+ OpenMP support on your system, you can compile Gamera with::
+@@ -169,8 +169,8 @@
+ python setup.py build --openmp=no
+
+
+-Installing without root priviledges
+------------------------------------
++Installing without root privileges
++----------------------------------
+
+ .. _without_root:
+
+@@ -189,7 +189,7 @@
+ Alternatively, you can set up a local installation by hand.
+
+ Make a local python module directory somewhere that you have write
+-priviledges (such as your home directory)::
++privileges (such as your home directory)::
+
+ mkdir ~/python
+
+@@ -258,7 +258,7 @@
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo pythonw setup.py install
+
+@@ -290,11 +290,11 @@
+ ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
+
+
+-Installing without root priviledges
+-```````````````````````````````````
++Installing without root privileges
++``````````````````````````````````
+
+ The instructions for `installing without root (administrator)
+-priviledges`__ can also be used on Mac OS-X.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+@@ -354,7 +354,7 @@
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo python setup.py install
+
+@@ -367,11 +367,11 @@
+ default installed to
+ ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
+
+-Installing without root priviledges
+-```````````````````````````````````
++Installing without root privileges
++``````````````````````````````````
+
+ The instructions for `installing without root (administrator)
+-priviledges`__ can also be used on Mac OS-X.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+--- a/doc/src/install.txt
++++ b/doc/src/install.txt
+@@ -1,4 +1,4 @@
+-==============================
++=============================
+ Building and installing Gamera
+ ==============================
+
+@@ -39,7 +39,7 @@
+ Fixes for common problems:
+
+ - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
+- which is an errenous in some versions of Mingw32. To fix it, you can
++ which is an erroneous in some versions of Mingw32. To fix it, you can
+ recreate the file from the DLL ``msvcr90.dll`` that comes with
+ Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
+
+@@ -162,7 +162,7 @@
+ python setup.py build
+ sudo python setup.py install
+
+-By default, parallelization of the genetica algorithms is only compiled
++By default, parallelization of the genetic algorithms is only compiled
+ into Gamera under Linux and with gcc version > 4.2, because we could only
+ get it running in this environment. If you are sure that you have unbroken
+ OpenMP support on your system, you can compile Gamera with::
+@@ -175,8 +175,8 @@
+ python setup.py build --openmp=no
+
+
+-Installing without root priviledges
+------------------------------------
++Installing without root privileges
++----------------------------------
+
+ .. _without_root:
+
+@@ -195,7 +195,7 @@
+ Alternatively, you can set up a local installation by hand.
+
+ Make a local python module directory somewhere that you have write
+-priviledges (such as your home directory)::
++privileges (such as your home directory)::
+
+ mkdir ~/python
+
+@@ -264,7 +264,7 @@
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo pythonw setup.py install
+
+@@ -296,11 +296,11 @@
+ ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
+
+
+-Installing without root priviledges
+-```````````````````````````````````
++Installing without root privileges
++``````````````````````````````````
+
+ The instructions for `installing without root (administrator)
+-priviledges`__ can also be used on Mac OS-X.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+@@ -360,7 +360,7 @@
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo python setup.py install
+
+@@ -373,11 +373,11 @@
+ default installed to
+ ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
+
+-Installing without root priviledges
+-```````````````````````````````````
++Installing without root privileges
++``````````````````````````````````
+
+ The instructions for `installing without root (administrator)
+-priviledges`__ can also be used on Mac OS-X.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+--- a/doc/src/kdtree.txt
++++ b/doc/src/kdtree.txt
+@@ -132,7 +132,7 @@
+ Even though there are general kd-tree algorithms to add and remove
+ nodes dynamically (see [Bentley1975]_), the present implementation
+ does not support alteration of a once built tree. This has the
+-consequence that tree nodes must be passed to the contructor of
++consequence that tree nodes must be passed to the constructor of
+ ``KdTree``.
+
+ A ``KdTree`` has the following (read only) properties:
+--- a/doc/src/plugins_custom_types.txt
++++ b/doc/src/plugins_custom_types.txt
+@@ -226,7 +226,7 @@
+ self.property2 = mc.property2
+ # ...
+
+- # the plugin implementing the actual contructor of MyClass
++ # the plugin implementing the actual constructor of MyClass
+ class create_myclass(PluginFunction):
+ self_type = None
+ args = Args([Int("arg1"), Real("arg2")])
+--- a/gamera/knn.py
++++ b/gamera/knn.py
+@@ -458,7 +458,7 @@
+ described in get_selections_by_features.
+
+ The dictionary must contain an entry for every feature of the currently
+-active feature set, that has been set in the contructor of the classifier or
++active feature set, that has been set in the constructor of the classifier or
+ by *change_feature_set*. Example:
+
+ .. code:: Python
+@@ -499,7 +499,7 @@
+
+ Set the weighing vector elements by the corresponding feature name.
+ The dictionary must contain an entry for every feature of the currently
+-active feature set, that has been set in the contructor of the classifier or
++active feature set, that has been set in the constructor of the classifier or
+ by *change_feature_set*. Example:
+
+ .. code:: Python
+--- a/src/knnga.cpp
++++ b/src/knnga.cpp
+@@ -558,7 +558,7 @@
+
+ // adjust the individual size for the case of weighting with
+ // prior deselected features and build an index relation map
+- // for futher index mapping
++ // for further index mapping
+ unsigned int indiLength = (unsigned int)this->knn->num_features;
+ std::map<unsigned int, unsigned int> indexRelation;
+ unsigned int indiIndex = 0;
+--- a/src/libtiff/README
++++ b/src/libtiff/README
+@@ -1,5 +1,5 @@
+-This copy of libtiff is provded for convenience on the Windows operating
+-system which does not inlcude this library by default.
++This copy of libtiff is provided for convenience on the Windows operating
++system which does not include this library by default.
+
+ More information, email contacts, and mailing list information can be
+ found online at http://www.libtiff.org/.
+--- a/src/pointobject.cpp
++++ b/src/pointobject.cpp
+@@ -54,7 +54,7 @@
+
+ static PyMethodDef point_methods[] = {
+ { (char *)"move", point_move, METH_VARARGS,
+- (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lineas are equivalent:\n\n.. code:: Python\n\n p.move(x,y)\n p += Point(x,y)"},
++ (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lines are equivalent:\n\n.. code:: Python\n\n p.move(x,y)\n p += Point(x,y)"},
+ { NULL }
+ };
+
Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series 2013-02-24 22:47:50 UTC (rev 23585)
+++ packages/gamera/trunk/debian/patches/series 2013-02-24 23:06:32 UTC (rev 23586)
@@ -7,3 +7,4 @@
namespace-package.diff
nosetests.diff
trap-errors-from-pclose.diff
+fix-typos.diff
More information about the Python-modules-commits
mailing list