From 902af0816ee06ab426b0b82cd0adf9b2c39af8e2 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Tue, 28 Feb 2017 09:58:24 +0100
Subject: [PATCH] Prefer the term "3-Clause BSD License" over "New BSD License"

The first is the newer name, which is also more telling.
---
 CHANGES.txt                                | 2 +-
 Protobuf.podspec                           | 2 +-
 java/pom.xml                               | 2 +-
 javanano/pom.xml                           | 2 +-
 php/ext/google/protobuf/package.xml        | 6 +++---
 protoc-artifacts/pom.xml                   | 2 +-
 python/compatibility_tests/v2.5.0/setup.py | 2 +-
 python/setup.py                            | 2 +-
 ruby/pom.xml                               | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3b02056b75..1164583645 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1381,7 +1381,7 @@
 2008-09-29 version 2.0.2:
 
   General
-  * License changed from Apache 2.0 to New BSD.
+  * License changed from Apache 2.0 to 3-Clause BSD.
   * It is now possible to define custom "options", which are basically
     annotations which may be placed on definitions in a .proto file.
     For example, you might define a field option called "foo" like so:
diff --git a/Protobuf.podspec b/Protobuf.podspec
index 4b88a4dfcb..0db70650ef 100644
--- a/Protobuf.podspec
+++ b/Protobuf.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.version  = '3.2.0'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/google/protobuf'
-  s.license  = 'New BSD'
+  s.license  = '3-Clause BSD License'
   s.authors  = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
   s.cocoapods_version = '>= 1.0'
 
diff --git a/java/pom.xml b/java/pom.xml
index 0257cf541a..f89e442246 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -39,7 +39,7 @@
 
   <licenses>
     <license>
-      <name>New BSD license</name>
+      <name>3-Clause BSD License</name>
       <url>https://opensource.org/licenses/BSD-3-Clause</url>
       <distribution>repo</distribution>
     </license>
diff --git a/javanano/pom.xml b/javanano/pom.xml
index 8d08f91cef..0395e8f2dc 100644
--- a/javanano/pom.xml
+++ b/javanano/pom.xml
@@ -21,7 +21,7 @@
   <url>https://developers.google.com/protocol-buffers/</url>
   <licenses>
     <license>
-      <name>New BSD license</name>
+      <name>3-Clause BSD License</name>
       <url>https://opensource.org/licenses/BSD-3-Clause</url>
       <distribution>repo</distribution>
     </license>
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index 167ed0f7a4..aac73d0511 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -20,7 +20,7 @@
   <release>alpha</release>
   <api>alpha</api>
  </stability>
- <license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
+ <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
  <notes>
 Second alpha release.
  </notes>
@@ -66,7 +66,7 @@ Second alpha release.
    </stability>
    <date>2016-09-23</date>
    <time>16:06:07</time>
-   <license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
    <notes>
 First alpha release
    </notes>
@@ -82,7 +82,7 @@ First alpha release
    </stability>
    <date>2017-01-13</date>
    <time>16:06:07</time>
-   <license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
    <notes>
 Second alpha release.
    </notes>
diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml
index 159087c5e1..28a2511926 100644
--- a/protoc-artifacts/pom.xml
+++ b/protoc-artifacts/pom.xml
@@ -21,7 +21,7 @@
   <url>https://developers.google.com/protocol-buffers/</url>
   <licenses>
     <license>
-      <name>New BSD license</name>
+      <name>3-Clause BSD License</name>
       <url>https://opensource.org/licenses/BSD-3-Clause</url>
       <distribution>repo</distribution>
     </license>
diff --git a/python/compatibility_tests/v2.5.0/setup.py b/python/compatibility_tests/v2.5.0/setup.py
index d8e34bc034..b41d54d4fe 100755
--- a/python/compatibility_tests/v2.5.0/setup.py
+++ b/python/compatibility_tests/v2.5.0/setup.py
@@ -64,7 +64,7 @@ if __name__ == '__main__':
       url='https://developers.google.com/protocol-buffers/',
       maintainer='protobuf@googlegroups.com',
       maintainer_email='protobuf@googlegroups.com',
-      license='New BSD License',
+      license='3-Clause BSD License',
       classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
diff --git a/python/setup.py b/python/setup.py
index 64e318f18d..a2026706e4 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -234,7 +234,7 @@ if __name__ == '__main__':
       url='https://developers.google.com/protocol-buffers/',
       maintainer='protobuf@googlegroups.com',
       maintainer_email='protobuf@googlegroups.com',
-      license='New BSD License',
+      license='3-Clause BSD License',
       classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
diff --git a/ruby/pom.xml b/ruby/pom.xml
index 7f475fd239..adf6ff207d 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -21,7 +21,7 @@
     <url>https://developers.google.com/protocol-buffers/</url>
     <licenses>
       <license>
-        <name>New BSD license</name>
+        <name>3-Clause BSD License</name>
         <url>https://opensource.org/licenses/BSD-3-Clause</url>
         <distribution>repo</distribution>
       </license>