[caffe] 02/03: patch: refresh cmake-fix-python-module-installdir

[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 b6b6987be9866b6aba51e0b472539363d65deff9
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Aug 1 04:30:36 2016 +0000

    patch: refresh cmake-fix-python-module-installdir
---
 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 ac8475b..d83a973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ caffe (1.0.0~rc3+20160715-g42cd785-1) UNRELEASED; urgency=medium
     - 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.
+  * Refresh patch cmake-fix-python-module-installdir.
 
  -- Zhou Mo <cdluminate at gmail.com>  Mon, 01 Aug 2016 02:19:21 +0000
 
diff --git a/debian/patches/cmake-fix-python-module-installdir b/debian/patches/cmake-fix-python-module-installdir
index ec34da8..b204802 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/caffe
+     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.git