[caffe-contrib] 70/362: d/*: update installs and links
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.
commit 5a3a17b76b85a940f9cabe4af4be3a4997320ec2
Author: Zhou Mo <cdluminate at gmail.com>
Date: Sat Aug 8 03:38:20 2015 +0000
d/*: update installs and links
---
debian/caffe-cpu.install | 16 +++++++++++++++-
debian/caffe-cpu.links | 30 +++++++++++++++---------------
debian/install_template | 15 ---------------
debian/libcaffe-cpu-dev.install | 39 +++++++++++++++++++++++++++++++++++++--
debian/libcaffe-cpu-dev.links | 2 +-
debian/libcaffe-cpu.install | 2 +-
6 files changed, 69 insertions(+), 35 deletions(-)
diff --git a/debian/caffe-cpu.install b/debian/caffe-cpu.install
index 2604a46..601256b 100644
--- a/debian/caffe-cpu.install
+++ b/debian/caffe-cpu.install
@@ -1 +1,15 @@
-distribute/bin/* usr/lib/caffe/
+debian/tmp/usr/bin/test_net usr/lib/caffe-cpu/test_net
+debian/tmp/usr/bin/caffe usr/lib/caffe-cpu/caffe
+debian/tmp/usr/bin/net_speed_benchmark usr/lib/caffe-cpu/net_speed_benchmark
+debian/tmp/usr/bin/extract_features usr/lib/caffe-cpu/extract_features
+debian/tmp/usr/bin/train_net usr/lib/caffe-cpu/train_net
+debian/tmp/usr/bin/upgrade_net_proto_binary usr/lib/caffe-cpu/upgrade_net_proto_binary
+debian/tmp/usr/bin/upgrade_net_proto_text usr/lib/caffe-cpu/upgrade_net_proto_text
+debian/tmp/usr/bin/device_query usr/lib/caffe-cpu/device_query
+debian/tmp/usr/bin/compute_image_mean usr/lib/caffe-cpu/compute_image_mean
+debian/tmp/usr/bin/finetune_net usr/lib/caffe-cpu/finetune_net
+debian/tmp/usr/bin/convert_imageset usr/lib/caffe-cpu/convert_imageset
+debian/tmp/usr/bin/classification usr/lib/caffe-cpu/classification
+debian/tmp/usr/bin/convert_mnist_data usr/lib/caffe-cpu/convert_mnist_data
+debian/tmp/usr/bin/convert_cifar_data usr/lib/caffe-cpu/convert_cifar_data
+debian/tmp/usr/bin/convert_mnist_siamese_data usr/lib/caffe-cpu/convert_mnist_siamese_data
diff --git a/debian/caffe-cpu.links b/debian/caffe-cpu.links
index b1e868e..f8dfa68 100644
--- a/debian/caffe-cpu.links
+++ b/debian/caffe-cpu.links
@@ -1,15 +1,15 @@
-/usr/lib/caffe/device_query.bin usr/bin/device_query
-/usr/lib/caffe/upgrade_net_proto_binary.bin usr/bin/upgrade_net_proto_binary
-/usr/lib/caffe/convert_imageset.bin usr/bin/convert_imageset
-/usr/lib/caffe/net_speed_benchmark.bin usr/bin/net_speed_benchmark
-/usr/lib/caffe/convert_mnist_data.bin usr/bin/convert_mnist_data
-/usr/lib/caffe/finetune_net.bin usr/bin/finetune_net
-/usr/lib/caffe/convert_cifar_data.bin usr/bin/convert_cifar_data
-/usr/lib/caffe/extract_features.bin usr/bin/extract_features
-/usr/lib/caffe/train_net.bin usr/bin/train_net
-/usr/lib/caffe/upgrade_net_proto_text.bin usr/bin/upgrade_net_proto_text
-/usr/lib/caffe/classification.bin usr/bin/classification
-/usr/lib/caffe/test_net.bin usr/bin/test_net
-/usr/lib/caffe/convert_mnist_siamese_data.bin usr/bin/convert_mnist_siamese_data
-/usr/lib/caffe/compute_image_mean.bin usr/bin/compute_image_mean
-/usr/lib/caffe/caffe.bin usr/bin/caffe
+/usr/lib/caffe-cpu/device_query usr/bin/device_query
+/usr/lib/caffe-cpu/upgrade_net_proto_binary usr/bin/upgrade_net_proto_binary
+/usr/lib/caffe-cpu/convert_imageset usr/bin/convert_imageset
+/usr/lib/caffe-cpu/net_speed_benchmark usr/bin/net_speed_benchmark
+/usr/lib/caffe-cpu/convert_mnist_data usr/bin/convert_mnist_data
+/usr/lib/caffe-cpu/finetune_net usr/bin/finetune_net
+/usr/lib/caffe-cpu/convert_cifar_data usr/bin/convert_cifar_data
+/usr/lib/caffe-cpu/extract_features usr/bin/extract_features
+/usr/lib/caffe-cpu/train_net usr/bin/train_net
+/usr/lib/caffe-cpu/upgrade_net_proto_text usr/bin/upgrade_net_proto_text
+/usr/lib/caffe-cpu/classification usr/bin/classification
+/usr/lib/caffe-cpu/test_net usr/bin/test_net
+/usr/lib/caffe-cpu/convert_mnist_siamese_data usr/bin/convert_mnist_siamese_data
+/usr/lib/caffe-cpu/compute_image_mean usr/bin/compute_image_mean
+/usr/lib/caffe-cpu/caffe usr/bin/caffe
diff --git a/debian/install_template b/debian/install_template
index 0b721dd..73c8256 100644
--- a/debian/install_template
+++ b/debian/install_template
@@ -42,35 +42,20 @@ caffe/debian/tmp/usr/lib/libcaffe.so
caffe/debian/tmp/usr/lib/libproto.a
caffe/debian/tmp/usr/python/caffe/proto/caffe_pb2.py
caffe/debian/tmp/usr/python/caffe/proto/__init__.py
-caffe/debian/tmp/usr/bin/test_net-0
caffe/debian/tmp/usr/bin/test_net
-caffe/debian/tmp/usr/bin/caffe-0
caffe/debian/tmp/usr/bin/caffe
-caffe/debian/tmp/usr/bin/net_speed_benchmark-0
caffe/debian/tmp/usr/bin/net_speed_benchmark
-caffe/debian/tmp/usr/bin/extract_features-0
caffe/debian/tmp/usr/bin/extract_features
-caffe/debian/tmp/usr/bin/train_net-0
caffe/debian/tmp/usr/bin/train_net
-caffe/debian/tmp/usr/bin/upgrade_net_proto_binary-0
caffe/debian/tmp/usr/bin/upgrade_net_proto_binary
-caffe/debian/tmp/usr/bin/upgrade_net_proto_text-0
caffe/debian/tmp/usr/bin/upgrade_net_proto_text
-caffe/debian/tmp/usr/bin/device_query-0
caffe/debian/tmp/usr/bin/device_query
-caffe/debian/tmp/usr/bin/compute_image_mean-0
caffe/debian/tmp/usr/bin/compute_image_mean
-caffe/debian/tmp/usr/bin/finetune_net-0
caffe/debian/tmp/usr/bin/finetune_net
-caffe/debian/tmp/usr/bin/convert_imageset-0
caffe/debian/tmp/usr/bin/convert_imageset
-caffe/debian/tmp/usr/bin/classification-0
caffe/debian/tmp/usr/bin/classification
-caffe/debian/tmp/usr/bin/convert_mnist_data-0
caffe/debian/tmp/usr/bin/convert_mnist_data
-caffe/debian/tmp/usr/bin/convert_cifar_data-0
caffe/debian/tmp/usr/bin/convert_cifar_data
-caffe/debian/tmp/usr/bin/convert_mnist_siamese_data-0
caffe/debian/tmp/usr/bin/convert_mnist_siamese_data
caffe/debian/tmp/usr/python/detect.py
caffe/debian/tmp/usr/python/draw_net.py
diff --git a/debian/libcaffe-cpu-dev.install b/debian/libcaffe-cpu-dev.install
index 9c20c9b..32cfa20 100644
--- a/debian/libcaffe-cpu-dev.install
+++ b/debian/libcaffe-cpu-dev.install
@@ -1,2 +1,37 @@
-distribute/include/* usr/include/
-distribute/lib/libcaffe.a usr/lib/
+caffe/debian/tmp/usr/include/caffe usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/common_layers.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/solver.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/layer_factory.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/common.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/layer.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/caffe.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/syncedmem.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/upgrade_proto.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/mkl_alternate.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/im2col.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/db_leveldb.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/math_functions.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/benchmark.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/db.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/device_alternate.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/rng.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/cudnn.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/insert_splits.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/io.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/util/db_lmdb.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/vision_layers.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/net.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/blob.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/neuron_layers.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/data_layers.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/internal_thread.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/loss_layers.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/python_layer.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/data_transformer.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/filler.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/test usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/test/test_caffe_main.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/test/test_gradient_check_util.hpp usr/include/caffe-cpu/
+caffe/debian/tmp/usr/include/caffe/proto/caffe.pb.h usr/include/caffe-cpu/
+caffe/debian/tmp/usr/lib/libproto.a usr/include/caffe-cpu/
diff --git a/debian/libcaffe-cpu-dev.links b/debian/libcaffe-cpu-dev.links
index 6f5ab4c..cde7649 100644
--- a/debian/libcaffe-cpu-dev.links
+++ b/debian/libcaffe-cpu-dev.links
@@ -1 +1 @@
-/usr/lib/libcaffe.so.0 usr/lib/libcaffe.so
+usr/lib/caffe-cpu/libcaffe.so.0 usr/lib/caffe-cpu/libcaffe.so
diff --git a/debian/libcaffe-cpu.install b/debian/libcaffe-cpu.install
index 2c7e1a2..5748299 100644
--- a/debian/libcaffe-cpu.install
+++ b/debian/libcaffe-cpu.install
@@ -1 +1 @@
-distribute/lib/libcaffe.so.0 usr/lib/
+caffe/debian/tmp/usr/lib/libcaffe.so.0 usr/lib/caffe-cpu/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git
More information about the debian-science-commits
mailing list