[caffe-contrib] 362/362: Merge 'debian/experimental'. Use master as default.

[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 dae845c0d22a01843d4b7625443faa846383caa1
Merge: bc147a6 c61555b
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue May 3 09:05:17 2016 +0000

    Merge 'debian/experimental'. Use master as default.

 debian/README.Debian                               |  187 +-
 debian/TODO                                        |    4 +
 debian/caffe-cpu.bash-completion                   |    2 +
 debian/caffe-cpu.install                           |   10 -
 debian/caffe-cpu.lintian-overrides                 |    1 +
 debian/caffe-cpu.manpages                          |   10 -
 debian/caffe-cuda.bash-completion                  |    2 +
 debian/caffe-cuda.install                          |   10 -
 debian/caffe-cuda.lintian-overrides                |    1 +
 debian/caffe-cuda.manpages                         |   10 -
 debian/caffe.install.in                            |   17 +
 debian/caffe.manpages.in                           |    1 +
 debian/changelog                                   |   10 +-
 debian/clean                                       |   14 +
 debian/control                                     |  147 +-
 debian/copyright                                   |  136 +-
 debian/install_template                            |  179 -
 debian/libcaffe-cpu-dev.install                    |   39 -
 debian/libcaffe-cpu-dev.links                      |    1 -
 debian/libcaffe-cpu0.install                       |    1 -
 debian/libcaffe-cpu0.lintian-overrides             |    1 -
 debian/libcaffe-cpu0.symbols                       | 7492 -------------------
 debian/libcaffe-cpu1.lintian-overrides             |    1 +
 debian/libcaffe-cuda-dev.install                   |   39 -
 debian/libcaffe-cuda-dev.links                     |    1 -
 debian/libcaffe-cuda0.install                      |    1 -
 debian/libcaffe-cuda0.lintian-overrides            |    1 -
 debian/libcaffe-cuda0.symbols                      | 7734 --------------------
 debian/libcaffe-cuda1.lintian-overrides            |    1 +
 debian/libcaffe-dev.install.in                     |    4 +
 debian/libcaffe.install.in                         |    1 +
 debian/man/caffe.1                                 |  260 +-
 debian/man/classification.1                        |   21 +-
 debian/man/compute_image_mean.1                    |   22 +-
 debian/man/convert_cifar_data.1                    |   53 -
 debian/man/convert_imageset.1                      |   65 +-
 debian/man/convert_mnist_data.1                    |   53 -
 debian/man/convert_mnist_siamese_data.1            |   53 -
 debian/man/extract_features.1                      |   21 +-
 debian/man/upgrade_net_proto_binary.1              |   21 +-
 debian/man/upgrade_net_proto_text.1                |   21 +-
 ...ake-add-target-property-version-soversion.patch |   27 -
 debian/patches/fix-spelling-error                  |   13 +
 debian/patches/remove-ignore.patch                 |   99 -
 debian/patches/series                              |    3 +-
 .../unapplied/00-fix-include-path-for-debian.patch |   52 -
 .../01-fix-makefile-rpath-and-soname.patch         |  108 -
 .../unapplied/03-set-cmake-deps-openblas.patch     |   11 -
 .../unapplied/04-fix-rpath-issue-in-cmake.patch    |   10 -
 .../patches/unapplied/05-set-cmake-cpuonly.patch   |   11 -
 .../unapplied/avoid-cmake-configgen-error.patch    |   11 +
 debian/python-caffe-cpu.install                    |   19 -
 debian/python-caffe-cpu.links                      |    1 -
 debian/python-caffe-cuda.install                   |   19 -
 debian/python-caffe-cuda.links                     |    1 -
 debian/python-caffe.examples.in                    |    3 +
 debian/python-caffe.install.in                     |    2 +
 debian/rules                                       |  276 +-
 debian/script/caffe                                |   68 +
 debian/script/change_header_path.patch             |   17 -
 debian/template_autogen.py                         |   40 +
 61 files changed, 644 insertions(+), 16795 deletions(-)

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