[caffe] 09/13: install: using python-caffe.install.in

[Zhou Mo]

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 b2faa3cb1e2f13bdbf7b5790bc12cce68fa9bfb4
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 05:39:24 2016 +0000

    install: using python-caffe.install.in
---
 debian/python-caffe-cpu.install  | 19 -------------------
 debian/python-caffe-cuda.install | 19 -------------------
 debian/python-caffe.install.in   | 19 +++++++++++++++++++
 debian/rules                     |  4 ++++
 4 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/debian/python-caffe-cpu.install b/debian/python-caffe-cpu.install
deleted file mode 100644
index b619a19..0000000
--- a/debian/python-caffe-cpu.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/caffe_cpu/python/requirements.txt                       usr/lib/python2.7/dist-packages/caffe/       
-debian/tmp/caffe_cpu/python/caffe/pycaffe.py                       usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/net_spec.py                      usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/io.py                            usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy    usr/lib/python2.7/dist-packages/caffe/imagenet/
-debian/tmp/caffe_cpu/python/caffe/__init__.py                      usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/classifier.py                    usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/_caffe.so.0                      usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/test/test_net.py                 usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py        usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py            usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/test/test_solver.py              usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cpu/python/caffe/detector.py                      usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py               usr/lib/python2.7/dist-packages/caffe/proto/
-debian/tmp/caffe_cpu/python/caffe/proto/__init__.py                usr/lib/python2.7/dist-packages/caffe/proto/
-debian/tmp/caffe_cpu/python/caffe/draw.py                          usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cpu/python/classify.py                            usr/bin/ 
-debian/tmp/caffe_cpu/python/draw_net.py                            usr/bin/ 
-debian/tmp/caffe_cpu/python/detect.py                              usr/bin/
diff --git a/debian/python-caffe-cuda.install b/debian/python-caffe-cuda.install
deleted file mode 100644
index 7485065..0000000
--- a/debian/python-caffe-cuda.install
+++ /dev/null
@@ -1,19 +0,0 @@
-debian/tmp/caffe_cuda/python/requirements.txt                    usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/pycaffe.py                    usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/net_spec.py                   usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/io.py                         usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/imagenet/
-debian/tmp/caffe_cuda/python/caffe/__init__.py                   usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/classifier.py                 usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/_caffe.so.0                   usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/test/test_net.py              usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py     usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py         usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/test/test_solver.py           usr/lib/python2.7/dist-packages/caffe/test/
-debian/tmp/caffe_cuda/python/caffe/detector.py                   usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py            usr/lib/python2.7/dist-packages/caffe/proto/
-debian/tmp/caffe_cuda/python/caffe/proto/__init__.py             usr/lib/python2.7/dist-packages/caffe/proto/
-debian/tmp/caffe_cuda/python/caffe/draw.py                       usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/caffe_cuda/python/classify.py                         usr/bin/
-debian/tmp/caffe_cuda/python/draw_net.py                         usr/bin/
-debian/tmp/caffe_cuda/python/detect.py                           usr/bin/
diff --git a/debian/python-caffe.install.in b/debian/python-caffe.install.in
new file mode 100644
index 0000000..3408cf7
--- /dev/null
+++ b/debian/python-caffe.install.in
@@ -0,0 +1,19 @@
+debian/tmp/#CAFFE_CONFIGURE#/python/requirements.txt                       usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/pycaffe.py                       usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/net_spec.py                      usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/io.py                            usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/imagenet/ilsvrc_2012_mean.npy    usr/lib/python2.7/dist-packages/caffe/imagenet/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/__init__.py                      usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/classifier.py                    usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/_caffe.so.0                      usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/test/test_net.py                 usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/test/test_python_layer.py        usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/test/test_net_spec.py            usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/test/test_solver.py              usr/lib/python2.7/dist-packages/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/detector.py                      usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/proto/caffe_pb2.py               usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/proto/__init__.py                usr/lib/python2.7/dist-packages/caffe/proto/
+debian/tmp/#CAFFE_CONFIGURE#/python/caffe/draw.py                          usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/classify.py                            usr/bin/
+debian/tmp/#CAFFE_CONFIGURE#/python/draw_net.py                            usr/bin/
+debian/tmp/#CAFFE_CONFIGURE#/python/detect.py                              usr/bin/
diff --git a/debian/rules b/debian/rules
index d2e6d75..2365f57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,10 @@ autogen:
 		< libcaffe-dev.links.in > libcaffe-cpu-dev.links
 	perl -p -e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
 		< libcaffe-dev.links.in > libcaffe-cuda-dev.links
+	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cpu}g;' \
+		< python-caffe.install.in > python-caffe-cpu.install
+	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cuda}g;' \
+		< python-caffe.install.in > python-caffe-cuda.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