[jffi-1.2.7] 04/10: document upstream license change

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository jffi-1.2.7.

commit 9548efe95571d1b77ca8d351bda4077231878870
Author: tony mancill <tmancill at debian.org>
Date:   Sun Jan 25 17:12:24 2015 -0800

    document upstream license change
---
 debian/changelog |  5 +++++
 debian/copyright | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1568f92..ad4fc0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 jffi (1.2.7-1) unstable; urgency=low
 
   * Team upload.
+  [ Tim Potter ]
   * New upstream release (Closes: #776082)
 
+  [ tony mancill ]
+  * Update debian/copyright; jffi is now dual-licensed under Apache 2.0 or
+    LGPL-3. (See upstream commit: 36b973f46c44efb728bc1db350ec5fd35347553e)
+
  -- Tim Potter <tpot at hp.com>  Mon, 24 Nov 2014 22:38:47 +1100
 
 jffi (1.0.2-11) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 7aa7a47..4055d2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,37 @@ Source: http://github.com/wmeissner/jffi
 
 Files: *
 Copyright: 2010 Wayne Meissner
-License: LGPL-3 only
- The full text of the license can be found in
+License: LGPL-3 or Apache 2.0
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  .
+      http://www.apache.org/licenses/LICENSE-2.0
+  .
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  .
+ The full text of the Apache 2.0 license can be found in
+ `/usr/share/common-licenses/Apache-2.0'.
+  .
+  Alternatively, you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+  . 
+  This code is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  version 3 for more details.
+  . 
+  You should have received a copy of the GNU Lesser General Public License
+  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+  .
+ .
+ The full text of the LGPL-3 license can be found in
  `/usr/share/common-licenses/LGPL-3'.
 
 Files: jni/jffi/queue.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-1.2.7.git