[caffe-contrib] 201/362: patch: remove patch 00-fix-include-path-for-debian.patch

[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 f8125b4d24157e800052361ede2da0f2f33e435b
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Sep 3 04:10:53 2015 +0000

    patch: remove patch 00-fix-include-path-for-debian.patch
---
 .../patches/00-fix-include-path-for-debian.patch   | 88 ----------------------
 debian/patches/series                              |  1 -
 .../unapplied/00-fix-include-path-for-debian.patch | 52 +++++++++++++
 3 files changed, 52 insertions(+), 89 deletions(-)

diff --git a/debian/patches/00-fix-include-path-for-debian.patch b/debian/patches/00-fix-include-path-for-debian.patch
deleted file mode 100644
index 7c49a13..0000000
--- a/debian/patches/00-fix-include-path-for-debian.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Fix include path in upstream source,
-in order to let compiler find them easier.
-diff --git a/include/caffe/data_layers.hpp b/include/caffe/data_layers.hpp
-index 3958cb7..2ccbaec 100644
---- a/include/caffe/data_layers.hpp
-+++ b/include/caffe/data_layers.hpp
-@@ -6,7 +6,7 @@
- #include <vector>
- 
- #include "boost/scoped_ptr.hpp"
--#include "hdf5.h"
-+#include "hdf5/serial/hdf5.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
-diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp
-index 3a62c3c..f4363f0 100644
---- a/include/caffe/util/io.hpp
-+++ b/include/caffe/util/io.hpp
-@@ -5,8 +5,8 @@
- #include <string>
- 
- #include "google/protobuf/message.h"
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
-diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
-index 8a782f7..42890be 100644
---- a/src/caffe/layers/hdf5_data_layer.cpp
-+++ b/src/caffe/layers/hdf5_data_layer.cpp
-@@ -10,8 +10,8 @@ TODO:
- #include <string>
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- #include "stdint.h"
- 
- #include "caffe/data_layers.hpp"
-diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
-index 5e3e4ce..23bc02a 100644
---- a/src/caffe/layers/hdf5_data_layer.cu
-+++ b/src/caffe/layers/hdf5_data_layer.cu
-@@ -7,8 +7,8 @@ TODO:
- #include <string>
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/data_layers.hpp"
- #include "caffe/layer.hpp"
-diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp
-index f63375c..0b57eb9 100644
---- a/src/caffe/layers/hdf5_output_layer.cpp
-+++ b/src/caffe/layers/hdf5_output_layer.cpp
-@@ -1,7 +1,7 @@
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
-diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu
-index ae497c3..ada682f 100644
---- a/src/caffe/layers/hdf5_output_layer.cu
-+++ b/src/caffe/layers/hdf5_output_layer.cu
-@@ -1,7 +1,7 @@
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
diff --git a/debian/patches/series b/debian/patches/series
index edca34f..9fef2d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 remove-ignore.patch
 workaround-switch-to-boost_python-py34.patch
 fix-cmake-add-target-property-version-soversion.patch
-00-fix-include-path-for-debian.patch
 01-fix-makefile-rpath-and-soname.patch
 02-empty-the-gitignore
diff --git a/debian/patches/unapplied/00-fix-include-path-for-debian.patch b/debian/patches/unapplied/00-fix-include-path-for-debian.patch
new file mode 100644
index 0000000..b1c9274
--- /dev/null
+++ b/debian/patches/unapplied/00-fix-include-path-for-debian.patch
@@ -0,0 +1,52 @@
+Fix include path in upstream source,
+in order to let compiler find them easier.
+--- a/src/caffe/layers/hdf5_data_layer.cpp
++++ b/src/caffe/layers/hdf5_data_layer.cpp
+@@ -10,8 +10,8 @@
+ #include <string>
+ #include <vector>
+ 
+-#include "hdf5.h"
+-#include "hdf5_hl.h"
++#include "hdf5/serial/hdf5.h"
++#include "hdf5/serial/hdf5_hl.h"
+ #include "stdint.h"
+ 
+ #include "caffe/data_layers.hpp"
+--- a/src/caffe/layers/hdf5_data_layer.cu
++++ b/src/caffe/layers/hdf5_data_layer.cu
+@@ -7,8 +7,8 @@
+ #include <string>
+ #include <vector>
+ 
+-#include "hdf5.h"
+-#include "hdf5_hl.h"
++#include "hdf5/serial/hdf5.h"
++#include "hdf5/serial/hdf5_hl.h"
+ 
+ #include "caffe/data_layers.hpp"
+ #include "caffe/layer.hpp"
+--- a/src/caffe/layers/hdf5_output_layer.cpp
++++ b/src/caffe/layers/hdf5_output_layer.cpp
+@@ -1,7 +1,7 @@
+ #include <vector>
+ 
+-#include "hdf5.h"
+-#include "hdf5_hl.h"
++#include "hdf5/serial/hdf5.h"
++#include "hdf5/serial/hdf5_hl.h"
+ 
+ #include "caffe/blob.hpp"
+ #include "caffe/common.hpp"
+--- a/src/caffe/layers/hdf5_output_layer.cu
++++ b/src/caffe/layers/hdf5_output_layer.cu
+@@ -1,7 +1,7 @@
+ #include <vector>
+ 
+-#include "hdf5.h"
+-#include "hdf5_hl.h"
++#include "hdf5/serial/hdf5.h"
++#include "hdf5/serial/hdf5_hl.h"
+ 
+ #include "caffe/blob.hpp"
+ #include "caffe/common.hpp"

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