[caffe] 01/03: patch: remove patch patches/cmake-octave-fix-library

[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 5565a7fad3742ee601cb8824c6395197ec2d1049
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Jul 4 14:01:28 2016 +0000

    patch: remove patch patches/cmake-octave-fix-library
---
 debian/patches/cmake-octave-fix-library | 25 -------------------------
 debian/patches/series                   |  1 -
 2 files changed, 26 deletions(-)

diff --git a/debian/patches/cmake-octave-fix-library b/debian/patches/cmake-octave-fix-library
deleted file mode 100644
index a485d76..0000000
--- a/debian/patches/cmake-octave-fix-library
+++ /dev/null
@@ -1,25 +0,0 @@
-Temporary hack for mkoctfile to file correct python3 lib
-
-Forward: no, keep it here
---- a/matlab/CMakeLists.txt
-+++ b/matlab/CMakeLists.txt
-@@ -42,6 +42,10 @@
- string(REPLACE ";" ";-L" link_folders "-L${folders}")
- string(REPLACE ";" ":"  rpath_folders   "${folders}")
- 
-+# [for Debian] Temporary hack so it won't fail
-+string(REPLACE "python3" "python3.5m" libflags "${libflags}")
-+string(REPLACE "-fPIE" "" cflags_octave "${cflags}")
-+
- if(build_using MATCHES "Matlab")
-   set(libflags -lcaffe${Caffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive
- 
-@@ -60,7 +64,7 @@
-   endif()
- 
-   add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler}
--      ARGS --mex -o ${Matlab_caffe_mex} ${Matlab_srcs} ${cflags} ${link_folders} ${libflags} -Wl,-rpath,${rpath_folders}
-+      ARGS --mex -v -o ${Matlab_caffe_mex} ${Matlab_srcs} ${cflags_octave} ${link_folders} ${libflags} -Wl,-rpath,${rpath_folders}
-       DEPENDS caffe COMMENT "Building Octave interface: ${Matlab_caffe_mex}" VERBATIM)
- 
-   add_custom_target(octave ALL DEPENDS ${Matlab_caffe_mex} SOURCES ${Matlab_srcs})
diff --git a/debian/patches/series b/debian/patches/series
index d66d554..ddc613e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ cmake-using-basic-blas
 cmake-using-gnuinstalldirs
 fix-spelling-error
 cmake-fix-python-module-installdir
-cmake-octave-fix-library

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