[caffe-contrib] 08/15: patch: remove fix-spelling-error

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 101539ef888d3bf63db7e4e01f7b75b7975d1a6b
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sun Oct 2 14:35:16 2016 +0000

    patch: remove fix-spelling-error
---
 debian/changelog                  |  2 ++
 debian/patches/fix-spelling-error | 14 --------------
 debian/patches/series             |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4f32de..0be5a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ caffe-contrib (1.0.0~rc3+20160930-ga7f950b-1) UNRELEASED; urgency=medium
     + cmake-avoid-argument-missing
     + cmake-fix-python-module-installdir
     + fix-more-float-comparison-precision-issue
+  * Remove following merged patches:
+    + fix-spelling-error
 
  -- Zhou Mo <cdluminate at gmail.com>  Wed, 10 Aug 2016 14:08:06 +0000
 
diff --git a/debian/patches/fix-spelling-error b/debian/patches/fix-spelling-error
deleted file mode 100644
index 892391c..0000000
--- a/debian/patches/fix-spelling-error
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix a spelling error. (Lintian)
-Forwarded: yes
-https://github.com/BVLC/caffe/pull/4236
---- a/src/caffe/layers/memory_data_layer.cpp
-+++ b/src/caffe/layers/memory_data_layer.cpp
-@@ -107,7 +107,7 @@
- template <typename Dtype>
- void MemoryDataLayer<Dtype>::Forward_cpu(const vector<Blob<Dtype>*>& bottom,
-       const vector<Blob<Dtype>*>& top) {
--  CHECK(data_) << "MemoryDataLayer needs to be initalized by calling Reset";
-+  CHECK(data_) << "MemoryDataLayer needs to be initialized by calling Reset";
-   top[0]->Reshape(batch_size_, channels_, height_, width_);
-   top[1]->Reshape(batch_size_, 1, 1, 1);
-   top[0]->set_cpu_data(data_ + pos_ * size_);
diff --git a/debian/patches/series b/debian/patches/series
index bf2df15..cacd9ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 cmake-using-basic-blas
 cmake-using-gnuinstalldirs
-fix-spelling-error
 cmake-fix-python-module-installdir
 cmake-avoid-argument-missing
 fix-more-float-comparison-precision-issue

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git