[caffe] 194/249: d/patch/*: update python2 patch

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:51:41 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 1c74d6b62b942a208e10402397dd84c20a2afcf5
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Sep 3 03:22:49 2015 +0000

    d/patch/*: update python2 patch
---
 .../unapplied/bump-python3-back-to-python2.patch   | 154 ++++++++++-----------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/debian/patches/unapplied/bump-python3-back-to-python2.patch b/debian/patches/unapplied/bump-python3-back-to-python2.patch
index a655b55..1b52c89 100644
--- a/debian/patches/unapplied/bump-python3-back-to-python2.patch
+++ b/debian/patches/unapplied/bump-python3-back-to-python2.patch
@@ -9,7 +9,7 @@ index 1402ff4..39da832 100644
 -               python3-all,
 -               python3-all-dev,
 -               python3-numpy,
-+               python-all,
++               python-all-dev, python-all,
 +               python-numpy,
                 dh-python,
                 bc,
@@ -66,25 +66,25 @@ index 0000000..9bbfbfb
 --- /dev/null
 +++ b/debian/python-caffe-cpu.install
 @@ -0,0 +1,19 @@
-+debian/tmp/caffe_cpu/python/requirements.txt                       usr/lib/python2.7/dist-packages/caffe/       
-+debian/tmp/caffe_cpu/python/classify.py                            usr/lib/python2.7/dist-packages/caffe/    
-+debian/tmp/caffe_cpu/python/caffe/pycaffe.py                       usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/net_spec.py                      usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/io.py                            usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy    usr/lib/python2.7/dist-packages/caffe/caffe/imagenet/
-+debian/tmp/caffe_cpu/python/caffe/__init__.py                      usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/classifier.py                    usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/_caffe.so.0                      usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/test/test_net.py                 usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py        usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py            usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_solver.py              usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/detector.py                      usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py               usr/lib/python2.7/dist-packages/caffe/caffe/proto/
-+debian/tmp/caffe_cpu/python/caffe/proto/__init__.py                usr/lib/python2.7/dist-packages/caffe/caffe/proto/
-+debian/tmp/caffe_cpu/python/caffe/draw.py                          usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cpu/python/draw_net.py                            usr/lib/python2.7/dist-packages/caffe/    
-+debian/tmp/caffe_cpu/python/detect.py                              usr/lib/python2.7/dist-packages/caffe/  
++debian/tmp/caffe_cpu/python/requirements.txt                       usr/lib/python2.7/dist-packages/       
++debian/tmp/caffe_cpu/python/classify.py                            usr/lib/python2.7/dist-packages/    
++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/draw_net.py                            usr/lib/python2.7/dist-packages/    
++debian/tmp/caffe_cpu/python/detect.py                              usr/lib/python2.7/dist-packages/  
 diff --git a/debian/python-caffe-cpu.links b/debian/python-caffe-cpu.links
 new file mode 100644
 index 0000000..44df179
@@ -98,25 +98,25 @@ index 0000000..0cc8bc5
 --- /dev/null
 +++ b/debian/python-caffe-cuda.install
 @@ -0,0 +1,19 @@
-+debian/tmp/caffe_cuda/python/requirements.txt                    usr/lib/python2.7/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/classify.py                         usr/lib/python2.7/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/pycaffe.py                    usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/net_spec.py                   usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/io.py                         usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/caffe/imagenet/
-+debian/tmp/caffe_cuda/python/caffe/__init__.py                   usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/classifier.py                 usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/_caffe.so.0                   usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/test/test_net.py              usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py     usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py         usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_solver.py           usr/lib/python2.7/dist-packages/caffe/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/detector.py                   usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py            usr/lib/python2.7/dist-packages/caffe/caffe/proto/
-+debian/tmp/caffe_cuda/python/caffe/proto/__init__.py             usr/lib/python2.7/dist-packages/caffe/caffe/proto/
-+debian/tmp/caffe_cuda/python/caffe/draw.py                       usr/lib/python2.7/dist-packages/caffe/caffe/
-+debian/tmp/caffe_cuda/python/draw_net.py                         usr/lib/python2.7/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/detect.py                           usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cuda/python/requirements.txt                    usr/lib/python2.7/dist-packages/
++debian/tmp/caffe_cuda/python/classify.py                         usr/lib/python2.7/dist-packages/
++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/draw_net.py                         usr/lib/python2.7/dist-packages/
++debian/tmp/caffe_cuda/python/detect.py                           usr/lib/python2.7/dist-packages/
 diff --git a/debian/python-caffe-cuda.links b/debian/python-caffe-cuda.links
 new file mode 100644
 index 0000000..44df179
@@ -130,25 +130,25 @@ index cd5c4ba..0000000
 --- a/debian/python3-caffe-cpu.install
 +++ /dev/null
 @@ -1,19 +0,0 @@
--debian/tmp/caffe_cpu/python/requirements.txt                       usr/lib/python3/dist-packages/caffe/       
--debian/tmp/caffe_cpu/python/classify.py                            usr/lib/python3/dist-packages/caffe/    
--debian/tmp/caffe_cpu/python/caffe/pycaffe.py                       usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/net_spec.py                      usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/io.py                            usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy    usr/lib/python3/dist-packages/caffe/caffe/imagenet/
--debian/tmp/caffe_cpu/python/caffe/__init__.py                      usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/classifier.py                    usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/_caffe.so.0                      usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/test/test_net.py                 usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py        usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py            usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_solver.py              usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/detector.py                      usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py               usr/lib/python3/dist-packages/caffe/caffe/proto/
--debian/tmp/caffe_cpu/python/caffe/proto/__init__.py                usr/lib/python3/dist-packages/caffe/caffe/proto/
--debian/tmp/caffe_cpu/python/caffe/draw.py                          usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cpu/python/draw_net.py                            usr/lib/python3/dist-packages/caffe/    
--debian/tmp/caffe_cpu/python/detect.py                              usr/lib/python3/dist-packages/caffe/  
+-debian/tmp/caffe_cpu/python/requirements.txt                       usr/lib/python3/dist-packages/       
+-debian/tmp/caffe_cpu/python/classify.py                            usr/lib/python3/dist-packages/    
+-debian/tmp/caffe_cpu/python/caffe/pycaffe.py                       usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/net_spec.py                      usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/io.py                            usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy    usr/lib/python3/dist-packages/caffe/imagenet/
+-debian/tmp/caffe_cpu/python/caffe/__init__.py                      usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/classifier.py                    usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/_caffe.so.0                      usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/test/test_net.py                 usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py        usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py            usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_solver.py              usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/detector.py                      usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py               usr/lib/python3/dist-packages/caffe/proto/
+-debian/tmp/caffe_cpu/python/caffe/proto/__init__.py                usr/lib/python3/dist-packages/caffe/proto/
+-debian/tmp/caffe_cpu/python/caffe/draw.py                          usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/draw_net.py                            usr/lib/python3/dist-packages/    
+-debian/tmp/caffe_cpu/python/detect.py                              usr/lib/python3/dist-packages/  
 diff --git a/debian/python3-caffe-cpu.links b/debian/python3-caffe-cpu.links
 deleted file mode 100644
 index 5b070d8..0000000
@@ -162,25 +162,25 @@ index 5964f6e..0000000
 --- a/debian/python3-caffe-cuda.install
 +++ /dev/null
 @@ -1,19 +0,0 @@
--debian/tmp/caffe_cuda/python/requirements.txt                    usr/lib/python3/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/classify.py                         usr/lib/python3/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/pycaffe.py                    usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/net_spec.py                   usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/io.py                         usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/caffe/imagenet/
--debian/tmp/caffe_cuda/python/caffe/__init__.py                   usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/classifier.py                 usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/_caffe.so.0                   usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/test/test_net.py              usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py     usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py         usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_solver.py           usr/lib/python3/dist-packages/caffe/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/detector.py                   usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py            usr/lib/python3/dist-packages/caffe/caffe/proto/
--debian/tmp/caffe_cuda/python/caffe/proto/__init__.py             usr/lib/python3/dist-packages/caffe/caffe/proto/
--debian/tmp/caffe_cuda/python/caffe/draw.py                       usr/lib/python3/dist-packages/caffe/caffe/
--debian/tmp/caffe_cuda/python/draw_net.py                         usr/lib/python3/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/detect.py                           usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/requirements.txt                    usr/lib/python3/dist-packages/
+-debian/tmp/caffe_cuda/python/classify.py                         usr/lib/python3/dist-packages/
+-debian/tmp/caffe_cuda/python/caffe/pycaffe.py                    usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/net_spec.py                   usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/io.py                         usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/imagenet/
+-debian/tmp/caffe_cuda/python/caffe/__init__.py                   usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/classifier.py                 usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/_caffe.so.0                   usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/test/test_net.py              usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py     usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py         usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_solver.py           usr/lib/python3/dist-packages/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/detector.py                   usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py            usr/lib/python3/dist-packages/caffe/proto/
+-debian/tmp/caffe_cuda/python/caffe/proto/__init__.py             usr/lib/python3/dist-packages/caffe/proto/
+-debian/tmp/caffe_cuda/python/caffe/draw.py                       usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/draw_net.py                         usr/lib/python3/dist-packages/
+-debian/tmp/caffe_cuda/python/detect.py                           usr/lib/python3/dist-packages/
 diff --git a/debian/python3-caffe-cuda.links b/debian/python3-caffe-cuda.links
 deleted file mode 100644
 index 5b070d8..0000000

-- 
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