[caffe-contrib] 05/15: patch: import newer 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 f96fe9e5c770d622504bdbc482a3509a16ad901f
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sun Oct 2 14:29:08 2016 +0000

    patch: import newer patch
---
 debian/changelog                                  |  1 +
 debian/patches/cmake-fix-python-module-installdir | 35 ++++++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a2525e..a154d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ caffe-contrib (1.0.0~rc3+20160930-ga7f950b-1) UNRELEASED; urgency=medium
   * Add git and libboost-dev to make cmake happy.
   * Update package description.
   * Update txt2man template d/man/caffe.txt and its corresponding manpage.
+  * Import updated patch cmake-fix-python-module-installdir from src:caffe .
 
  -- Zhou Mo <cdluminate at gmail.com>  Wed, 10 Aug 2016 14:08:06 +0000
 
diff --git a/debian/patches/cmake-fix-python-module-installdir b/debian/patches/cmake-fix-python-module-installdir
index ec34da8..4e299e4 100644
--- a/debian/patches/cmake-fix-python-module-installdir
+++ b/debian/patches/cmake-fix-python-module-installdir
@@ -1,5 +1,21 @@
-fix python module installdir in cmake for Debian
-Forwarded: no
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -28,7 +28,7 @@
+ 
+ # module
+ install(DIRECTORY caffe
+-    DESTINATION python
++    DESTINATION lib/python3/dist-packages
+     FILES_MATCHING
+     PATTERN "*.py"
+     PATTERN "ilsvrc_2012_mean.npy"
+@@ -36,5 +36,5 @@
+     )
+ 
+ # _caffe.so
+-install(TARGETS pycaffe  DESTINATION python/caffe)
++install(TARGETS pycaffe  DESTINATION lib/python3/dist-packages/caffe)
+ 
 --- a/src/caffe/CMakeLists.txt
 +++ b/src/caffe/CMakeLists.txt
 @@ -35,6 +35,6 @@
@@ -10,18 +26,3 @@ Forwarded: no
 +install(PROGRAMS ${proto_python} DESTINATION lib/python3/dist-packages/caffe/proto)
  
  
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -26,9 +26,9 @@
- install(FILES ${files1} DESTINATION python)
- 
- file(GLOB files2 caffe/*.py)
--install(FILES  ${files2} DESTINATION python/caffe)
--install(TARGETS pycaffe  DESTINATION python/caffe)
--install(DIRECTORY caffe/imagenet caffe/proto caffe/test DESTINATION python/caffe)
-+install(FILES  ${files2} DESTINATION lib/python3/dist-packages/caffe)
-+install(TARGETS pycaffe  DESTINATION lib/python3/dist-packages/caffe)
-+install(DIRECTORY caffe/imagenet caffe/proto caffe/test DESTINATION lib/python3/dist-packages/caffe)
- 
- 
- 

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