[pktools] 02/03: Add patch to fix 'caught' typo.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Dec 21 01:19:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pktools.
commit a281912e94a84f9f3a35c645c2a8d267a713d052
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Dec 21 01:57:25 2015 +0100
Add patch to fix 'caught' typo.
---
debian/changelog | 1 +
debian/patches/caught-typo.patch | 274 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 276 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 1d1e6cf..80a365a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pktools (2.6.5-1~exp2) UNRELEASED; urgency=medium
* Update symbols for other architectures (except mips*).
+ * Add patch to fix 'caught' typo.
-- Bas Couwenberg <sebastic at debian.org> Mon, 21 Dec 2015 01:28:07 +0100
diff --git a/debian/patches/caught-typo.patch b/debian/patches/caught-typo.patch
new file mode 100644
index 0000000..b2308a8
--- /dev/null
+++ b/debian/patches/caught-typo.patch
@@ -0,0 +1,274 @@
+Description: Fix 'catched' typo, replace with 'caught'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://savannah.nongnu.org/bugs/?46730
+
+--- a/src/algorithms/FeatureSelector.h
++++ b/src/algorithms/FeatureSelector.h
+@@ -349,7 +349,7 @@ template<class T> double FeatureSelector
+ }
+ tmpset.push_front(last);
+ }
+- if(maxCost<0){//all levels removed were catched
++ if(maxCost<0){//all levels removed were caught
+ subset=catchset;
+ }
+ //test: assert list contains no duplicate elements
+--- a/src/apps/pkann.cc
++++ b/src/apps/pkann.cc
+@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //delete class 0 ?
+@@ -771,7 +771,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -845,7 +845,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ mask_opt.clear();
+@@ -863,7 +863,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -913,7 +913,7 @@ int main(int argc, char *argv[])
+ exit(3);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ assert(nband==hpixel[0].size());
+@@ -933,7 +933,7 @@ int main(int argc, char *argv[])
+ exit(3);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ }
+@@ -974,7 +974,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ oldRowMask=rowMask;
+--- a/src/apps/pkcomposite.cc
++++ b/src/apps/pkcomposite.cc
+@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //todo: support multiple masks
+@@ -656,7 +656,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -799,7 +799,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ oldRowMask=rowMask;
+--- a/src/apps/pkcrop.cc
++++ b/src/apps/pkcrop.cc
+@@ -416,7 +416,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //todo: support multiple masks
+@@ -439,7 +439,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -746,7 +746,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ oldRowMask=rowMask;
+--- a/src/apps/pkfsann.cc
++++ b/src/apps/pkfsann.cc
+@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //delete class 0 ?
+@@ -695,7 +695,7 @@ int main(int argc, char *argv[])
+ }
+ }
+ catch(...){
+- std::cout << "catched feature selection" << std::endl;
++ std::cout << "caught feature selection" << std::endl;
+ exit(1);
+ }
+
+--- a/src/apps/pkfssvm.cc
++++ b/src/apps/pkfssvm.cc
+@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //todo: delete class 0 ?
+@@ -733,7 +733,7 @@ int main(int argc, char *argv[])
+ }
+ }
+ catch(...){
+- std::cout << "catched feature selection" << std::endl;
++ std::cout << "caught feature selection" << std::endl;
+ exit(1);
+ }
+
+--- a/src/apps/pkinfo.cc
++++ b/src/apps/pkinfo.cc
+@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
+ // std::cout << "image description: " << imgReader.getImageDescription() << std::endl;
+ // }
+ // catch(...){
+- // std::cout << "catched" << std::endl;
++ // std::cout << "caught" << std::endl;
+ // }
+ std::list<std::string> metaData;
+ imgReader.getMetadata(metaData);
+--- a/src/apps/pkoptsvm.cc
++++ b/src/apps/pkoptsvm.cc
+@@ -389,7 +389,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ //todo delete class 0 ?
+@@ -674,7 +674,7 @@ int main(int argc, char *argv[])
+ // cout << e.what() << endl;
+ // }
+ // catch(...){
+- // cerr << "error catched" << std::endl;
++ // cerr << "error caught" << std::endl;
+ // exit(1);
+ // }
+
+--- a/src/apps/pksvm.cc
++++ b/src/apps/pksvm.cc
+@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+
+@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -858,7 +858,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ mask_opt.clear();
+@@ -876,7 +876,7 @@ int main(int argc, char *argv[])
+ exit(2);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(1);
+ }
+ }
+@@ -922,7 +922,7 @@ int main(int argc, char *argv[])
+ exit(3);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ assert(nband==hpixel[0].size());
+@@ -942,7 +942,7 @@ int main(int argc, char *argv[])
+ exit(3);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ }
+@@ -983,7 +983,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ catch(...){
+- cerr << "error catched" << std::endl;
++ cerr << "error caught" << std::endl;
+ exit(3);
+ }
+ oldRowMask=rowMask;
diff --git a/debian/patches/series b/debian/patches/series
index e9e0975..923ee0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
automake-subdir-objects.patch
+caught-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git
More information about the Pkg-grass-devel
mailing list