Skip to content

Commit cf6ee10

Browse files
shimatshimat
authored
Merge pull request shimat#600 from shimat/license
nuspec: change deprecated licenseUrl to license
2 parents 84040c6 + ae93694 commit cf6ee10

File tree

5 files changed

+40
-33
lines changed

5 files changed

+40
-33
lines changed

‎LICENSE

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
1-
BSD 3-Clause License
2-
3-
Copyright (c) 2017, shimat
4-
All rights reserved.
5-
6-
Redistribution and use in source and binary forms, with or without
7-
modification, are permitted provided that the following conditions are met:
8-
9-
* Redistributions of source code must retain the above copyright notice, this
10-
list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
16-
* Neither the name of the copyright holder nor the names of its
17-
contributors may be used to endorse or promote products derived from
18-
this software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
By downloading, copying, installing or using the software you agree to this license.
2+
If you do not agree to this license, do not download, install,
3+
copy or use the software.
4+
5+
6+
License Agreement
7+
For Open Source Computer Vision Library
8+
(3-clause BSD License)
9+
10+
Copyright (c) 2008-2019, shimat
11+
Third party copyrights are property of their respective owners.
12+
13+
Redistribution and use in source and binary forms, with or without modification,
14+
are permitted provided that the following conditions are met:
15+
16+
* Redistributions of source code must retain the above copyright notice,
17+
this list of conditions and the following disclaimer.
18+
19+
* Redistributions in binary form must reproduce the above copyright notice,
20+
this list of conditions and the following disclaimer in the documentation
21+
and/or other materials provided with the distribution.
22+
23+
* Neither the names of the copyright holders nor the names of the contributors
24+
may be used to endorse or promote products derived from this software
25+
without specific prior written permission.
26+
27+
This software is provided by the copyright holders and contributors "as is" and
28+
any express or implied warranties, including, but not limited to, the implied
29+
warranties of merchantability and fitness for a particular purpose are disclaimed.
30+
In no event shall copyright holders or contributors be liable for any direct,
31+
indirect, incidental, special, exemplary, or consequential damages
32+
(including, but not limited to, procurement of substitute goods or services;
33+
loss of use, data, or profits; or business interruption) however caused
34+
and on any theory of liability, whether in contract, strict liability,
35+
or tort (including negligence or otherwise) arising in any way out of
36+
the use of this software, even if advised of the possibility of such damage.

‎nuget/OpenCvSharp4.Windows.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181228</version>
66
<title>OpenCvSharp NuGet package for x64/x86 Windows (same as OpenCvSharp3-AnyCPU)</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181228</version>
66
<title>OpenCvSharp core library. A package of separate native bindings for your OS is required.</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.runtime.ubuntu.18.04-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181225</version>
66
<title>OpenCvSharp native bindings for ubuntu.18.04-x64</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.runtime.win.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181225</version>
66
<title>OpenCvSharp4 native bindings for Windows x64/x86</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

0 commit comments

Comments
 (0)