[caffe] 01/03: patch: remove fix-spelling-error, merged by upstream

[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.

commit fdf995e6d1188869f7d0cf75d5b2a618d718f904
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Aug 1 03:53:23 2016 +0000

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

diff --git a/debian/changelog b/debian/changelog
index e4c7496..ac8475b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ caffe (1.0.0~rc3+20160715-g42cd785-1) UNRELEASED; urgency=medium
     - dont-set-map-size-1TB-in-db-lmdb
     - print-to-stderr-for-example-LMDB-code
     - update-MNIST-example-to-use-new-DB-classes
+  * Remove patch fix-spelling-error, which was merged by upstream.
 
  -- Zhou Mo <cdluminate at gmail.com>  Mon, 01 Aug 2016 02:19:21 +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 ddc613e..30425ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 cmake-using-basic-blas
 cmake-using-gnuinstalldirs
-fix-spelling-error
 cmake-fix-python-module-installdir

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