This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pktools.
commit 2b2b20ca1089ddcab4eb58895502687339a71f7a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Oct 15 16:29:41 2016 +0200
Add patch to fix spelling errors.
---
debian/changelog | 1 +
debian/man/pkfilter.1.xml | 2 +-
debian/man/pkfilterdem.1.xml | 2 +-
debian/man/pkreclass.1.xml | 2 +-
debian/man/pkstatprofile.1.xml | 2 +-
debian/patches/pkg-config-not-executable.patch | 2 +-
debian/patches/series | 1 +
debian/patches/spelling-errors2.patch | 76 ++++++++++++++++++++++++++
8 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ecc37b1..f91cedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pktools (2.6.7-3) UNRELEASED; urgency=medium
* Update symbols for ppc64.
+ * Add patch to fix spelling errors.
-- Bas Couwenberg <sebas...@debian.org> Tue, 24 May 2016 00:12:43 +0200
diff --git a/debian/man/pkfilter.1.xml b/debian/man/pkfilter.1.xml
index e349032..a5cf04a 100644
--- a/debian/man/pkfilter.1.xml
+++ b/debian/man/pkfilter.1.xml
@@ -722,7 +722,7 @@
<para>
color table (file with 5 columns:
id R G B ALFA (0: transparent, 255: solid)).
- Use none to ommit color table
+ Use none to omit color table
</para>
</listitem>
</varlistentry>
diff --git a/debian/man/pkfilterdem.1.xml b/debian/man/pkfilterdem.1.xml
index 7efc484..bf5554d 100644
--- a/debian/man/pkfilterdem.1.xml
+++ b/debian/man/pkfilterdem.1.xml
@@ -116,7 +116,7 @@
<para>
color table (file with 5 columns:
id R G B ALFA (0: transparent, 255: solid)).
- Use none to ommit color table
+ Use none to omit color table
</para>
</listitem>
</varlistentry>
diff --git a/debian/man/pkreclass.1.xml b/debian/man/pkreclass.1.xml
index 9d1039c..dee8307 100644
--- a/debian/man/pkreclass.1.xml
+++ b/debian/man/pkreclass.1.xml
@@ -83,7 +83,7 @@
<term><option>--code</option>
<replaceable>filename</replaceable></term>
<listitem>
<para>
- Recode text file (2 colums: from to)
+ Recode text file (2 columns: from to)
</para>
</listitem>
</varlistentry>
diff --git a/debian/man/pkstatprofile.1.xml b/debian/man/pkstatprofile.1.xml
index 5589bda..6f16d45 100644
--- a/debian/man/pkstatprofile.1.xml
+++ b/debian/man/pkstatprofile.1.xml
@@ -202,7 +202,7 @@
<para>
Color table (file with 5 columns:
id R G B ALFA (0: transparent, 255: solid).
- Use none to ommit color table.
+ Use none to omit color table.
</para>
</listitem>
</varlistentry>
diff --git a/debian/patches/pkg-config-not-executable.patch
b/debian/patches/pkg-config-not-executable.patch
index 1cfdcf1..f7b7ed1 100644
--- a/debian/patches/pkg-config-not-executable.patch
+++ b/debian/patches/pkg-config-not-executable.patch
@@ -5,7 +5,7 @@ Applied-Upstream:
http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -359,7 +359,7 @@ endif()
+@@ -363,7 +363,7 @@ endif()
#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
#test
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
diff --git a/debian/patches/series b/debian/patches/series
index fcfdb98..f70f7eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ spelling-errors.patch
build-pklas2img.patch
pkg-config-not-executable.patch
pklas2img-CPLErr-conversion.patch
+spelling-errors2.patch
diff --git a/debian/patches/spelling-errors2.patch
b/debian/patches/spelling-errors2.patch
new file mode 100644
index 0000000..859b1c1
--- /dev/null
+++ b/debian/patches/spelling-errors2.patch
@@ -0,0 +1,76 @@
+Description: Fix spelling errors.
+ * colums -> columns
+ * ommit -> omit
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/src/apps/pkreclass.cc
++++ b/src/apps/pkreclass.cc
+@@ -43,7 +43,7 @@ along with pktools. If not, see <http:/
+ | m | mask | std::string | |Mask image(s) |
+ | msknodata | msknodata | unsigned short | 1 |Mask value(s)
where image has nodata. Use one value for each mask, or multiple values for a
single mask. |
+ | nodata | nodata | int | 0 |nodata value to put in image
if not valid (0) |
+- | code | code | std::string | |Recode text file (2
colums: from to) |
++ | code | code | std::string | |Recode text file (2
columns: from to) |
+ | c | class | std::string | |list of classes to
reclass (in combination with reclass option) |
+ | r | reclass | std::string | |list of recoded
classes (in combination with class option) |
+ | ct | ct | std::string | |color table (file
with 5 columns: id R G B ALFA (0: transparent, 255: solid) |
+@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
+ Optionpk<unsigned short> band_opt("b", "band", "band index(es) to replace
(other bands are copied to output)", 0);
+ Optionpk<string> type_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image", "");
+ Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate).","GTiff");
+- Optionpk<string> code_opt("code", "code", "Recode text file (2 colums: from
to)");
++ Optionpk<string> code_opt("code", "code", "Recode text file (2 columns:
from to)");
+ Optionpk<string> class_opt("c", "class", "list of classes to reclass (in
combination with reclass option)");
+ Optionpk<string> reclass_opt("r", "reclass", "list of recoded classes (in
combination with class option)");
+ Optionpk<string> fieldname_opt("n", "fname", "field name of the shape file
to be replaced", "label");
+--- a/src/apps/pkfilter.cc
++++ b/src/apps/pkfilter.cc
+@@ -211,7 +211,7 @@ pkfilter -i lena.tif -o sobelx.tif -f so
+ | interp | interp | std::string | akima |type of interpolation
for spectral filtering (see
http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html) |
+ | ot | otype | std::string | |Data type for output
image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image |
+ | of | oformat | std::string | GTiff |Output image format
(see also gdal_translate).|
+- | ct | ct | std::string | |color table (file
with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit
color table |
++ | ct | ct | std::string | |color table (file
with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit
color table |
+ | circ | circular | bool | false |circular disc kernel for
dilation and erosion |
+
+ Usage: pkfilter -i input -o output [-f filter | -perc value | -srf file [-srf
file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout
wavelength -fwhm value]* -win wavelength [-win wavelength]*]
+@@ -256,7 +256,7 @@ int main(int argc,char **argv) {
+ Optionpk<std::string> interpolationType_opt("interp", "interp", "type of
interpolation for spectral filtering (see
http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
+ Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image","");
+ Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate).","GTiff");
+- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color
table");
++ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color
table");
+ Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
+ Optionpk<short> down_opt("d", "down", "down sampling factor. Use value 1
for no downsampling). Use value n>1 for downsampling (aggregation)", 1);
+ Optionpk<string> beta_opt("beta", "beta", "ASCII file with beta for each
class transition in Markov Random Field");
+--- a/src/apps/pkfilterdem.cc
++++ b/src/apps/pkfilterdem.cc
+@@ -61,7 +61,7 @@ The utility pkfilterdem can be used to f
+ | minchange | minchange | short | 0 |Stop iterations when no
more pixels are changed than this threshold. |
+ | ot | otype | std::string | |Data type for output
image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image |
+ | of | oformat | std::string | GTiff |Output image format
(see also gdal_translate).|
+- | ct | ct | std::string | |color table (file
with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit
color table |
++ | ct | ct | std::string | |color table (file
with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit
color table |
+ | nodata | nodata | short | |nodata value |
+
+ Usage: pkfilterdem -i input.txt -o output
+@@ -85,7 +85,7 @@ int main(int argc,char **argv) {
+ Optionpk<short> minChange_opt("minchange", "minchange", "Stop iterations
when no more pixels are changed than this threshold.", 0);
+ Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image","");
+ Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate).","GTiff");
+- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color
table");
++ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color
table");
+ Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
+ Optionpk<short> nodata_opt("nodata", "nodata", "nodata value");
+ Optionpk<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
+--- a/src/apps/pkstatprofile.cc
++++ b/src/apps/pkstatprofile.cc
+@@ -104,7 +104,7 @@ int main(int argc,char **argv) {
+ Optionpk<double> nodata_opt("nodata", "nodata", "nodata value(s)");
+ Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image","");
+ Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate)","GTiff");
+- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color
table");
++ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color
table");
+ Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
+ // Optionpk<short> down_opt("d", "down", "down sampling factor. Use value 1
for no downsampling). Use value n>1 for downsampling (aggregation)", 1);
+ Optionpk<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
