[SCM] Java Foreign Function Interface branch, master, updated. debian/1.0.2-9-9-ge691587

tony mancill tmancill at debian.org
Mon Jun 10 20:39:23 UTC 2013


The following commit has been merged in the master branch:
commit e6915876b935fbfb9370b9800a2425fa3549f3a4
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jun 10 13:29:09 2013 -0700

    update d/copyright; note team NMU

diff --git a/debian/changelog b/debian/changelog
index 4f88f73..a8e608c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 jffi (1.0.2-10) unstable; urgency=low
 
+  * Team upload.
+
   [ Jakub Adam ]
   * Add OSGi metadata into jffi.jar. (currently disabled - see below)
   * Add Jakub Adam to Uploaders.
@@ -11,6 +13,7 @@ jffi (1.0.2-10) unstable; urgency=low
   * Remove non UTF-8 in debian changelog. (Closes: #711890)
   * Acknowledge NMU - thank you to Matthias Klose.
     - Closes: #646594, #707797, #701301
+  * Address lintian warning regarding BSD license.
 
  -- tony mancill <tmancill at debian.org>  Mon, 10 Jun 2013 13:16:54 -0700
 
diff --git a/debian/copyright b/debian/copyright
index d58db13..e15dcff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,5 +64,26 @@ License: BSD
 Files: debian/*
 Copyright: 2010 Torsten Werner <twerner at debian.org>
 License: BSD
- The full text of the license can be found in
- `/usr/share/common-licenses/BSD'.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.

-- 
Java Foreign Function Interface



More information about the pkg-java-commits mailing list