[pktools] 05/07: Drop caught-typo.patch, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Jan 22 12:08:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pktools.
commit a39dea93342160f82d5b82a7fff784ef1015b24e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 22 12:18:44 2016 +0100
Drop caught-typo.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/caught-typo.patch | 274 ---------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 275 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5d46535..f72a200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pktools (2.6.6-1) UNRELEASED; urgency=medium
* New upstream release.
* Update manpages for upstream changes.
+ * Drop caught-typo.patch, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Fri, 22 Jan 2016 11:48:31 +0100
diff --git a/debian/patches/caught-typo.patch b/debian/patches/caught-typo.patch
deleted file mode 100644
index b2308a8..0000000
--- a/debian/patches/caught-typo.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-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 923ee0a..e9e0975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
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