[caffe-contrib] 263/362: install: using template caffe.install.in

[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-contrib.

commit ad4a9b76bd8daf4936cdb7d0ebcba4c9efa42107
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 05:17:30 2016 +0000

    install: using template caffe.install.in
---
 debian/caffe-cpu.install  | 13 -------------
 debian/caffe-cuda.install | 13 -------------
 debian/caffe.install.in   | 13 +++++++++++++
 debian/rules              |  7 +++++++
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/debian/caffe-cpu.install b/debian/caffe-cpu.install
deleted file mode 100644
index 6079625..0000000
--- a/debian/caffe-cpu.install
+++ /dev/null
@@ -1,13 +0,0 @@
-debian/tmp/caffe_cpu/bin/convert_imageset             usr/bin
-debian/tmp/caffe_cpu/bin/extract_features             usr/bin
-debian/tmp/caffe_cpu/bin/compute_image_mean           usr/bin  
-debian/tmp/caffe_cpu/bin/classification               usr/bin
-debian/tmp/caffe_cpu/bin/caffe                        usr/bin
-debian/tmp/caffe_cpu/bin/convert_mnist_data           usr/bin  
-debian/tmp/caffe_cpu/bin/convert_mnist_siamese_data   usr/bin 
-debian/tmp/caffe_cpu/bin/upgrade_net_proto_text       usr/bin    
-debian/tmp/caffe_cpu/bin/convert_cifar_data           usr/bin  
-debian/tmp/caffe_cpu/bin/upgrade_net_proto_binary     usr/bin        
-
-# Package Maintainer's bash-completion script
-debian/script/caffe usr/share/bash-completion/completions/
diff --git a/debian/caffe-cuda.install b/debian/caffe-cuda.install
deleted file mode 100644
index 0a99f34..0000000
--- a/debian/caffe-cuda.install
+++ /dev/null
@@ -1,13 +0,0 @@
-debian/tmp/caffe_cuda/bin/convert_imageset             usr/bin                      
-debian/tmp/caffe_cuda/bin/extract_features             usr/bin                      
-debian/tmp/caffe_cuda/bin/compute_image_mean           usr/bin                        
-debian/tmp/caffe_cuda/bin/classification               usr/bin                    
-debian/tmp/caffe_cuda/bin/caffe                        usr/bin           
-debian/tmp/caffe_cuda/bin/convert_mnist_data           usr/bin                        
-debian/tmp/caffe_cuda/bin/convert_mnist_siamese_data   usr/bin                                
-debian/tmp/caffe_cuda/bin/upgrade_net_proto_text       usr/bin                            
-debian/tmp/caffe_cuda/bin/convert_cifar_data           usr/bin                        
-debian/tmp/caffe_cuda/bin/upgrade_net_proto_binary     usr/bin                              
-
-# Package Maintainer's bash-completion script
-debian/script/caffe usr/share/bash-completion/completions/
diff --git a/debian/caffe.install.in b/debian/caffe.install.in
new file mode 100644
index 0000000..4510950
--- /dev/null
+++ b/debian/caffe.install.in
@@ -0,0 +1,13 @@
+debian/tmp/#CAFFE_CONFIGURE#/bin/convert_imageset             usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/extract_features             usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/compute_image_mean           usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/classification               usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/caffe                        usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/convert_mnist_data           usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/convert_mnist_siamese_data   usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/upgrade_net_proto_text       usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/convert_cifar_data           usr/bin
+debian/tmp/#CAFFE_CONFIGURE#/bin/upgrade_net_proto_binary     usr/bin
+
+# Package Maintainer's bash-completion script
+debian/script/caffe usr/share/bash-completion/completions/
diff --git a/debian/rules b/debian/rules
index 018016f..2ce5bb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,13 @@ CONFFLAG_CUDA = \
 		--buildsystem=cmake \
 		--with python2 --requires=python/requirements.txt
 
+autogen:
+	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cpu}g;" \
+		< caffe.install.in > caffe-cpu.install
+	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
+		< caffe.install.in > caffe-cuda.install
+
+
 override_dh_auto_configure:
 	dh_auto_configure \
 		--builddirectory=${CAFFE_CPU_BUILDDIR} \

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