[SCM] blender/master: debian/copyright: file updated
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Tue Nov 15 21:26:22 UTC 2016
The following commit has been merged in the master branch:
commit 5ea8d28f3da6e61d2e6c15385cdf352dba6eb339
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Fri Nov 11 10:59:12 2016 +0100
debian/copyright: file updated
diff --git a/debian/copyright b/debian/copyright
index 79c993d..d497372 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -109,15 +109,15 @@ License: BSD-Simplified
Files: extern/glog/src/*
Copyright: 1999-2008, Google Inc.
-License: BSD-New-(Google)
+License: BSD-New-Google
Files: extern/ceres/*
Copyright: 2010-2013, Google Inc.
-License: BSD-New-(Google)
+License: BSD-New-Google
Files: extern/gflags/*
Copyright: 1999, 2006-2008, 2011, Google Inc.
-License: BSD-New-(Google)
+License: BSD-New-Google
Files: intern/libmv/*
Copyright: 2007-2013, libmv authors.
@@ -301,67 +301,62 @@ License: Zlib
Files: intern/cycles/kernel/closure/bsdf_microfacet.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_util.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_refraction.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_toon.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_reflection.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_transparent.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2012, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_phong_ramp.h
Copyright: 2009-2010 Sony Pictures Imageworks Inc.
2012, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/bsdf_diffuse.h
Copyright: 2009-2010 Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/closure/emissive.h
Copyright: 2009-2010, Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/cycles/kernel/osl/background.cpp
Copyright: 2009-2010 Sony Pictures Imageworks Inc.
2011, Blender Foundation
-License: BSD-New-(Sony)
-
-Files: intern/cycles/kernel/osl/osl_bssrdf.h
-Copyright: 2009-2010, Sony Pictures Imageworks Inc.
- 2011, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: intern/itasc/*
Copyright: 2007, Ruben Smits
@@ -373,7 +368,7 @@ License: LGPL-2.1+
Files: intern/opencolorio/ocio_impl_glsl.cc
Copyright: 2003-2010, Sony Pictures Imageworks Inc.
2013, Blender Foundation
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Files: release/scripts/addons/io_export_unreal_psk_psa.py
release/scripts/addons/io_export_dxf/__init__.py
@@ -611,7 +606,7 @@ License: LGPL-2.1+
On Debian systems the full text of the GNU Lesser General Public License can
be found in the `/usr/share/common-licenses/LGPL-2' file.
-License: BSD-New-(Google)
+License: BSD-New-Google
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -637,7 +632,7 @@ License: BSD-New-(Google)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-License: BSD-New-(Sony)
+License: BSD-New-Sony
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
--
blender packaging
More information about the pkg-multimedia-commits
mailing list