[caffe] 04/13: install: using libcaffe.install.in

Zhou Mo cdluminate-guest at moszumanska.debian.org
Wed Mar 9 06:03:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit a8b89b782dcbe4d369cd3a6f9cc06e2003be5e6c
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 05:24:47 2016 +0000

    install: using libcaffe.install.in
---
 debian/libcaffe-cpu0.install  | 1 -
 debian/libcaffe-cuda0.install | 1 -
 debian/libcaffe.install.in    | 1 +
 debian/rules                  | 9 +++++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/libcaffe-cpu0.install b/debian/libcaffe-cpu0.install
deleted file mode 100644
index 2d26e29..0000000
--- a/debian/libcaffe-cpu0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/caffe_cpu/lib/libcaffe.so.0 usr/lib/
diff --git a/debian/libcaffe-cuda0.install b/debian/libcaffe-cuda0.install
deleted file mode 100644
index c9fa3b7..0000000
--- a/debian/libcaffe-cuda0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/caffe_cuda/lib/libcaffe.so.0 usr/lib/
diff --git a/debian/libcaffe.install.in b/debian/libcaffe.install.in
new file mode 100644
index 0000000..7a1b3dd
--- /dev/null
+++ b/debian/libcaffe.install.in
@@ -0,0 +1 @@
+debian/tmp/#CAFFE_CONFIGURE#/lib/libcaffe.so.#CAFFE_SOVER# usr/lib/
diff --git a/debian/rules b/debian/rules
index c6ca4ca..2b0b490 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 RULES         := debian/rules
 ORIG_SOURCE   := "https://github.com/BVLC/caffe/archive/rc2.tar.gz"
+CAFFE_SOVER   := "1.0.0-rc3"
 
 export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
 export CAFFE_CUDA_BUILDDIR="caffe_cuda_build"
@@ -68,8 +69,12 @@ autogen:
 		< caffe.manpages.in > caffe-cpu.manpages
 	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
 		< caffe.manpages.in > caffe-cuda.manpages
-
-
+	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
+		-e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
+		< libcaffe.install.in > libcaffe-cpu0.install
+	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
+		-e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
+		< libcaffe.install.in > libcaffe-cuda0.install
 
 override_dh_auto_configure:
 	dh_auto_configure \

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



More information about the debian-science-commits mailing list