[caffe] 84/249: d/copyright: update

[Zhou Mo]

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 20c4de538983e15ae242e5dea5882528a4a3dc05
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Aug 8 06:32:39 2015 +0000

    d/copyright: update
---
 debian/copyright | 59 ++++++++++++++++++++------------------------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1ecb1e0..c188a4c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,14 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: caffe
 Source: http://caffe.berkeleyvision.org/
 
-Files:     debian/*
-Copyright: 2015 Zhou Mo
-License:   GPL-3.0+
-
 Files:     *
 Copyright: 2014,2015 The Regents of the University of California (Regents)
            2014,2015 the respective contributors of caffe
-License:   CAFFE_LICENSE
+License:   CAFFE_LICENSE_BSD-2-Clause
 
 Files:     scripts/cpp_lint.py
            src/gtest/gtest_main.cc
@@ -46,7 +42,7 @@ License:   BSD-3-Clause
 
 Files:     cmake/Modules/FindLMDB.cmake
 Copyright: 2006 Laurent Montel, <montel at kde.org>
-License:   __UNKNOWN__
+License:   BSD
  Redistribution and use is allowed according to the terms of the BSD license.
  .
  Adapted from FindCWD by:
@@ -137,39 +133,26 @@ License:   BSD-3-Clause
  On Debian systems, the complete text of the BSD 3-clause "New" or "Revised"
  License can be found in `/usr/share/common-licenses/BSD'.
 
-#----------------------------------------------------------------------------
-# xml and html files (skipped):
-#         docs/_layouts/default.html
-#         examples/web_demo/templates/index.html
-
-#----------------------------------------------------------------------------
-# binary files (skipped):
-#         src/caffe/test/test_data/sample_data_2_gzip.h5
-#         src/caffe/test/test_data/sample_data.h5
-#         docs/tutorial/fig/layer.jpg
-#         docs/tutorial/fig/forward_backward.png
-#         docs/tutorial/fig/logreg.jpg
-#         docs/tutorial/fig/forward.jpg
-#         docs/tutorial/fig/backward.jpg
-#         docs/images/caffeine-icon.png
-#         docs/images/GitHub-Mark-64px.png
-#         examples/finetune_flickr_style/flickr_style.csv.gz
-#         examples/images/fish-bike.jpg
-#         examples/images/cat_gray.jpg
-#         examples/images/cat.jpg
-#         python/caffe/imagenet/ilsvrc_2012_mean.npy
-#         matlab/+caffe/imagenet/ilsvrc_2012_mean.mat
-
-#----------------------------------------------------------------------------
-# huge files   (skipped):
-#         examples/00-classification.ipynb
-
-#----------------------------------------------------------------------------
-# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
-# license/copyright files.
+Files:     debian/*
+Copyright: 2015 Zhou Mo <cdluminate at gmail.com>
+License:   GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-#----------------------------------------------------------------------------
-License: CAFFE_LICENSE
+License: CAFFE_LICENSE_BSD-2-Clause
  COPYRIGHT
  .
  All contributions by the University of California:

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