[caffe] 01/02: d/*: remove octave related packages

[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 3e402385667a310596ada308fd55e10ce003b9be
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Jul 4 13:02:13 2016 +0000

    d/*: remove octave related packages
---
 debian/changelog                   |  7 +++++++
 debian/control                     | 20 +-------------------
 debian/octave-caffe-cpu.install.in |  4 ----
 debian/rules                       | 11 ++---------
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d50207..f952936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+caffe (1.0.0~rc3-3) UNRELEASED; urgency=medium
+
+  * Remove octave related packages and corresponding builds, because
+    upstream support for octave is limited.
+
+ -- Zhou Mo <cdluminate at gmail.com>  Sat, 02 Jul 2016 06:02:02 +0000
+
 caffe (1.0.0~rc3-2) experimental; urgency=low
 
   * d/control
diff --git a/debian/control b/debian/control
index b5584e0..2abd464 100644
--- a/debian/control
+++ b/debian/control
@@ -22,12 +22,10 @@ Build-Depends: bc,
                liblmdb-dev,
 # switch libblas.so.3 between Atlas and OpenBLAS with update-alternatives
                libblas-dev | libblas.so,
-               liboctave-dev,
                libopencv-dev (>= 2.4),
                libprotobuf-dev,
                libprotoc-dev,
                libsnappy-dev,
-               octave-pkg-dev,
                protobuf-compiler,
 # python3 depssome of them are not B-D but we need them as runtime-deps to pass the testsuite
                python3-dev,
@@ -139,23 +137,7 @@ Description: Python3 interface of Caffe (CPU_ONLY)
  and modularity in mind. It is developed by the Berkeley Vision
  and Learning Center (BVLC) and community contributors.
  .
- This package contains the python3 interface of caffe, and is configured
- as CPU_ONLY.
-
-#Package: octave-caffe-cpu
-#Architecture: any
-#Multi-Arch: foreign
-#Depends: libcaffe-cpu1 (= ${binary:Version}),
-#         ${misc:Depends},
-#         ${shlibs:Depends},
-#Conflicts: octave-caffe-cuda
-#Description: Octave interface of Caffe (CPU_ONLY)
-# Caffe is a deep learning framework made with expression, speed,
-# and modularity in mind. It is developed by the Berkeley Vision
-# and Learning Center (BVLC) and community contributors.
-# .
-# This package contains the octave interface of caffe, and is configured
-# as CPU_ONLY.
+ It contains python3 interface of caffe, configured as CPU_ONLY.
 
 Package: caffe-doc
 Section: doc
diff --git a/debian/octave-caffe-cpu.install.in b/debian/octave-caffe-cpu.install.in
deleted file mode 100644
index 826362d..0000000
--- a/debian/octave-caffe-cpu.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-matlab/+caffe/*.m           #MDIR#/caffe/
-matlab/+caffe/+test/*.m     #MDIR#/caffe/test/
-matlab/+caffe/private/*.m   #MDIR#/caffe/private/
-usr/matlab/caffe_.mex       #OCTDIR#/caffe/
diff --git a/debian/rules b/debian/rules
index 4c821a2..7f6e984 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,6 @@ BUILDDIR      := "caffe_cpu_build"
 TEMPLATES     := $(wildcard debian/*.in)
 AUTOGEN       := $(patsubst %.in,%,$(TEMPLATES))
 
-include /usr/share/octave/debian/defs.make
-
 ## CMake Configuration Template.
 ## * PLEASE sync this common template with caffe-contrib source.
 CMAKE_CONFIGURE_TEMPLATE = \
@@ -26,7 +24,7 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DBLAS="Generic" \
 	-DBUILD_SHARED_LIBS=ON \
 	-DBUILD_docs=OFF \
-	-DBUILD_matlab=ON \
+	-DBUILD_matlab=OFF \
 	-DBUILD_python=ON \
 	-DBUILD_python_layer=ON \
 	-Dpython_version="3" \
@@ -91,12 +89,7 @@ override_dh_auto_build-indep:
 
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=$(BUILDDIR) \
-		-- caffe pycaffe
-	# remove -fPIE flag or mkoctfile will fail.
-	dh_auto_build --builddirectory=$(BUILDDIR) \
-		-- octave CXXFLAGS="$(filter-out -fPIE,$(CXXFLAGS))"
-	dh_auto_build --builddirectory=$(BUILDDIR) \
-		-- test.testbin all
+		-- caffe pycaffe test.testbin all
 
 # In the test phase, we need to set LD_LIBRARY_PATH properly
 # for those test ELFs linked with libcaffe.so.X

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