[mlpack-git] mlpack-1.0.x: Switch to BSD from LGPL, and update a few things. (cabe3ec)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit cabe3ec19f2a67246407f147783aff40458d46fe
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Jan 7 10:54:37 2015 -0500

    Switch to BSD from LGPL, and update a few things.
    
    Conflicts:
    	COPYRIGHT.txt


>---------------------------------------------------------------

cabe3ec19f2a67246407f147783aff40458d46fe
 COPYRIGHT.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 83b208e..6127a15 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: MLPACK
-Upstream-Contact: Ryan Curtin <gth671b at mail.gatech.edu>
+Upstream-Name: mlpack
+Upstream-Contact: Ryan Curtin <ryan at ratml.org>
 Source: http://www.mlpack.org/
 
 Files: *
-Copyright: Copyright 2008-2014, Ryan Curtin <gth671b at mail.gatech.edu>
+Copyright: Copyright 2008-2015, Ryan Curtin <ryan at ratml.org>
 Copyright: Copyright 2008-2013, Bill March <march at gatech.edu>
 Copyright: Copyright 2008-2012, Dongryeol Lee <dongryel at cc.gatech.edu>
 Copyright: Copyright 2008-2013, Nishant Mehta <niche at cc.gatech.edu>
@@ -31,6 +31,6 @@ Copyright: Copyright 2014, Abhishek Laddha <laddhaabhishek11 at gmail.com>
 Copyright: Copyright 2014, Vahab Akbarzadeh <v.akbarzadeh at gmail.com>
 Copyright: Copyright 2014, Andrew Wells <andrewmw94 at gmail.com>
 Copyright: Copyright 2014, Zhihao Lou <lzh1984 at gmail.com>
-License: LGPL-3+
+License: BSD-3-clause
   The text of the license is available on Debian systems in the
-  /usr/share/common-licenses/LGPL-3 file.
+  /usr/share/common-licenses/BSD file.