[caffe] 06/16: patch: 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 aa3df0eaf30f896164112d10bbc6a65ee51be4c1
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed May 18 06:50:35 2016 +0000

    patch: cmake-fix-python-module-installdir
---
 debian/patches/cmake-fix-python-module-installdir | 25 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/cmake-fix-python-module-installdir b/debian/patches/cmake-fix-python-module-installdir
new file mode 100644
index 0000000..08e5f85
--- /dev/null
+++ b/debian/patches/cmake-fix-python-module-installdir
@@ -0,0 +1,25 @@
+--- a/src/caffe/CMakeLists.txt
++++ b/src/caffe/CMakeLists.txt
+@@ -35,6 +35,6 @@
+ 
+ file(WRITE ${PROJECT_BINARY_DIR}/__init__.py)
+ list(APPEND proto_python ${PROJECT_BINARY_DIR}/__init__.py)
+-install(PROGRAMS ${proto_python} DESTINATION python/caffe/proto)
++install(PROGRAMS ${proto_python} DESTINATION lib/python2.7/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/python2.7/dist-packages/caffe)
++install(TARGETS pycaffe  DESTINATION lib/python2.7/dist-packages/caffe)
++install(DIRECTORY caffe/imagenet caffe/proto caffe/test DESTINATION lib/python2.7/dist-packages/caffe)
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 88e9306..fb035da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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