[caffe-contrib] 71/362: d/*.install: fix install path

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 7d3bfd0454e8becb1c312637db9b060717161181
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Aug 8 03:50:22 2015 +0000

    d/*.install: fix install path
---
 debian/caffe-cpu.install        | 30 ++++++++---------
 debian/libcaffe-cpu-dev.install | 73 ++++++++++++++++++++---------------------
 debian/rules                    |  3 +-
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/debian/caffe-cpu.install b/debian/caffe-cpu.install
index 601256b..56405fb 100644
--- a/debian/caffe-cpu.install
+++ b/debian/caffe-cpu.install
@@ -1,15 +1,15 @@
-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                                          
+debian/tmp/usr/bin/test_net                         usr/lib/caffe-cpu/
+debian/tmp/usr/bin/caffe                            usr/lib/caffe-cpu/
+debian/tmp/usr/bin/net_speed_benchmark              usr/lib/caffe-cpu/
+debian/tmp/usr/bin/extract_features                 usr/lib/caffe-cpu/
+debian/tmp/usr/bin/train_net                        usr/lib/caffe-cpu/
+debian/tmp/usr/bin/upgrade_net_proto_binary         usr/lib/caffe-cpu/
+debian/tmp/usr/bin/upgrade_net_proto_text           usr/lib/caffe-cpu/
+debian/tmp/usr/bin/device_query                     usr/lib/caffe-cpu/
+debian/tmp/usr/bin/compute_image_mean               usr/lib/caffe-cpu/
+debian/tmp/usr/bin/finetune_net                     usr/lib/caffe-cpu/
+debian/tmp/usr/bin/convert_imageset                 usr/lib/caffe-cpu/
+debian/tmp/usr/bin/classification                   usr/lib/caffe-cpu/
+debian/tmp/usr/bin/convert_mnist_data               usr/lib/caffe-cpu/
+debian/tmp/usr/bin/convert_cifar_data               usr/lib/caffe-cpu/
+debian/tmp/usr/bin/convert_mnist_siamese_data       usr/lib/caffe-cpu/
diff --git a/debian/libcaffe-cpu-dev.install b/debian/libcaffe-cpu-dev.install
index 32cfa20..fb6a254 100644
--- a/debian/libcaffe-cpu-dev.install
+++ b/debian/libcaffe-cpu-dev.install
@@ -1,37 +1,36 @@
-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/
+debian/tmp/usr/include/caffe/common_layers.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/solver.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/layer_factory.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/common.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/layer.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/caffe.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/syncedmem.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/upgrade_proto.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/mkl_alternate.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/im2col.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/db_leveldb.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/math_functions.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/benchmark.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/db.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/device_alternate.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/rng.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/cudnn.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/insert_splits.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/io.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/util/db_lmdb.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/vision_layers.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/net.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/blob.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/neuron_layers.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/data_layers.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/internal_thread.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/loss_layers.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/python_layer.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/data_transformer.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/filler.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/test  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/test/test_caffe_main.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/test/test_gradient_check_util.hpp  usr/include/caffe-cpu/
+debian/tmp/usr/include/caffe/proto/caffe.pb.h  usr/include/caffe-cpu/
+debian/tmp/usr/lib/libproto.a  usr/include/caffe-cpu/
diff --git a/debian/rules b/debian/rules
index f25607a..5a58102 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,8 @@ override_dh_auto_configure:
 
 override_dh_auto_clean:
 	dh_testdir
-	-$(RM) -rf ${CAFFE_CPU_BUILDDIR}
+	-$(RM) -rf ${CAFFE_CPU_BUILDDIR}  python/caffe/proto/
+	-$(RM) python/caffe/_caffe.so
 
 # 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-contrib.git



More information about the debian-science-commits mailing list