From 21620b198a507b51bcd8feb7efe0df5ead48c8e8 Mon Sep 17 00:00:00 2001
From: Dan Rollo <danrollo@gmail.com>
Date: Wed, 29 Jun 2016 22:25:15 -0400
Subject: [PATCH] Fix Apache License naming as requested by issue #673.

---
 ASL2.0 => AL2.0           | 0
 CHANGES.md                | 3 ++-
 LICENSE                   | 4 ++--
 LICENSE.ASL => LICENSE.AL | 2 +-
 build.xml                 | 2 +-
 parent/pom.xml            | 2 +-
 pom-jna-platform.xml      | 2 +-
 pom-jna.xml               | 4 ++--
 8 files changed, 10 insertions(+), 9 deletions(-)
 rename ASL2.0 => AL2.0 (100%)
 rename LICENSE.ASL => LICENSE.AL (85%)

diff --git a/ASL2.0 b/AL2.0
similarity index 100%
rename from ASL2.0
rename to AL2.0
diff --git a/CHANGES.md b/CHANGES.md
index ed99c47da8..c013b5693a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and ASL (see LICENSE).
+NOTE: as of JNA 4.0, JNA is now dual-licensed under LGPL and AL (see LICENSE).
 
 NOTE: JNI native support is typically incompatible between minor versions, and almost always incompatible between major versions.
 
@@ -72,6 +72,7 @@ Bug Fixes
 * [#633](https://github.com/java-native-access/jna/pull/633): Restore default usage of platform native encoding for Java strings passed to native functions (was hard-coded to UTF-8 in 4.0 and later) [@amake](https://github.com/amake)
 * [#634](https://github.com/java-native-access/jna/pull/634): Improve BSTR handling and add `SysStringByteLen` and `SysStringLen` to `com.sun.jna.platform.win32.OleAuto` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#646](https://github.com/java-native-access/jna/issues/646): `platform.win32.COM.COMBindingBaseObject` swallows reason if instantiation fails - [@matthiasblaesing](https://github.com/matthiasblaesing).
+* [#647](https://github.com/java-native-access/jna/pull/647): Update references to Apache License as requested by issue #673 [@bhamail](https://github.com/bhamail)
 * [#636](https://github.com/java-native-access/jna/issues/636); Staticly link visual c++ runtime when building with MSVC - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 4.2.1
diff --git a/LICENSE b/LICENSE
index 6de5f5dc4f..a2c4ca6de9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,10 +13,10 @@ A copy is also included in the downloadable source code package
 containing JNA, in file "LGPL2.1", under the same directory
 as this file.
 
-You may obtain a copy of the ASL License at:
+You may obtain a copy of the AL License at:
 
 http://www.apache.org/licenses/
 
 A copy is also included in the downloadable source code package
-containing JNA, in file "ASL2.0", under the same directory
+containing JNA, in file "AL2.0", under the same directory
 as this file.
diff --git a/LICENSE.ASL b/LICENSE.AL
similarity index 85%
rename from LICENSE.ASL
rename to LICENSE.AL
index 3f12dee191..a958a38f0e 100644
--- a/LICENSE.ASL
+++ b/LICENSE.AL
@@ -8,5 +8,5 @@ You may obtain a copy of the License at:
 http://www.apache.org/licenses/
 
 A copy is also included in the downloadable source code package
-containing JNA, in file "ASL2.0", under the same directory
+containing JNA, in file "AL2.0", under the same directory
 as this file.
diff --git a/build.xml b/build.xml
index daab651da5..c59d84453c 100644
--- a/build.xml
+++ b/build.xml
@@ -1143,7 +1143,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <!-- Javadoc -->
     <!-- JNA sources only, for use in Linux build from source/shared libffi -->
     <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,ASL2.0"/>
+      <zipfileset dir="." includes="build.xml,${pom},LICENSE,LGPL2.1,AL2.0"/>
       <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
       <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
       <zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>
diff --git a/parent/pom.xml b/parent/pom.xml
index b299ad1d95..026b39815a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -18,7 +18,7 @@
             <distribution>repo</distribution>
         </license>
         <license>
-            <name>ASL, version 2</name>
+            <name>AL v2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
diff --git a/pom-jna-platform.xml b/pom-jna-platform.xml
index c4d29b625f..b61eea5ac1 100644
--- a/pom-jna-platform.xml
+++ b/pom-jna-platform.xml
@@ -20,7 +20,7 @@
           <distribution>repo</distribution>
       </license>
       <license>
-          <name>ASL, version 2</name>
+          <name>AL v2.0</name>
           <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
           <distribution>repo</distribution>
       </license>
diff --git a/pom-jna.xml b/pom-jna.xml
index 54d63ce18b..9da3a52a61 100644
--- a/pom-jna.xml
+++ b/pom-jna.xml
@@ -20,7 +20,7 @@
           <distribution>repo</distribution>
       </license>
       <license>
-          <name>ASL, version 2</name>
+          <name>AL v2.0</name>
           <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
           <distribution>repo</distribution>
       </license>
@@ -50,4 +50,4 @@
     </developer>
   </developers>
 
-</project>
\ No newline at end of file
+</project>