[pkg-opensc-commit] [SCM] pkcs11-helper packaging branch, master, updated. upstream/1.10-26-g31976c9

[Eric Dorland]

The following commit has been merged in the master branch:
commit 343a0ed8d8de4075d67f25a734386ec9f6a32837
Author: Eric Dorland <eric at debian.org>
Date:   Sun Sep 11 21:51:32 2011 -0400

    debian/copyright: Include full BSD license to quell lintian warning.

diff --git a/debian/changelog b/debian/changelog
index 4509d88..551927d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ pkcs11-helper (1.09-1) unstable; urgency=low
   * debian/control: Standards-Version to 3.9.2.
   * debian/control, debian/compat, debian/libpkcs11-helper1.install: Make
     package multiarch aware, and use debhelper level 9.
+  * debian/copyright: Include full BSD license to quell lintian warning.
 
- -- Eric Dorland <eric at debian.org>  Sun, 11 Sep 2011 21:47:32 -0400
+ -- Eric Dorland <eric at debian.org>  Sun, 11 Sep 2011 21:51:20 -0400
 
 pkcs11-helper (1.08-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index c525f72..9e3ab69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,6 +14,33 @@ Copyright:
   licenses.  You may choose to be licensed under the terms of the GNU
   General Public License (GPL) Version 2, or the BSD license.
 
+  	BSD License
+	============
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	    o Redistributions of source code must retain the above copyright notice,
+	      this list of conditions and the following disclaimer.
+	    o 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.
+	    o Neither the name of the Alon Bar-Lev 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+
+
 m4 Macros License
 
 	autoconf/automake
@@ -74,5 +101,4 @@ Doxygen License (Optional component, documentation)
 
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License version 2 can be found in /usr/share/common-licenses/GPL-2. 
-The complete text of the BSD can be found in /usr/share/common-licenses/BSD.
+Public License version 2 can be found in /usr/share/common-licenses/GPL-2.

-- 
pkcs11-helper packaging