[pkg-wpa-devel] r1549 - in /hostapd/trunk/debian: changelog copyright hostapd.lintian-overrides

[jandd at users.alioth.debian.org]

Author: jandd
Date: Tue Sep  7 18:42:54 2010
New Revision: 1549

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1549
Log:
* debian/copyright: include license text of the BSD license variant,
  add myself to the list of copyright holders for the debian/* files
* add debian/hostapd.lintian-overrides and install it as
  /usr/share/lintian/overrides/hostapd to fix possible-gpl-code-linked-
  with-openssl Lintian error

Added:
    hostapd/trunk/debian/hostapd.lintian-overrides
Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/copyright

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1549&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Tue Sep  7 18:42:54 2010
@@ -3,6 +3,11 @@
   * New upstream release, upstream declares this as the new stable release.
   * debian/control: update Standards-Version to 3.9.1 (no changes
     necessary)
+  * debian/copyright: include license text of the BSD license variant,
+    add myself to the list of copyright holders for the debian/* files
+  * add debian/hostapd.lintian-overrides and install it as
+    /usr/share/lintian/overrides/hostapd to fix possible-gpl-code-linked-
+    with-openssl Lintian error
 
  -- Jan Dittberner <jandd at debian.org>  Tue, 07 Sep 2010 19:46:52 +0200
 

Modified: hostapd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/copyright?rev=1549&op=diff
==============================================================================
--- hostapd/trunk/debian/copyright (original)
+++ hostapd/trunk/debian/copyright Tue Sep  7 18:42:54 2010
@@ -5,6 +5,7 @@
 Files: debian/*
 Copyright: Copyright (c) 2007-2009, Kel Modderman <kel at otaku42.de>
 Copyright: Copyright (c) 2005-2009, Faidon Liambotis <paravoid at debian.org>
+Copyright: Copyright (c) 2010, Jan Dittberner <jandd at debian.org>
 License: BSD | GPL-2
 
 Files: debian/driver_madwifi/*
@@ -93,8 +94,32 @@
  License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
 License: BSD
-  On Debian GNU/Linux systems, the complete text of the BSD 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(s) of the above-listed copyright holder(s) 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.
 
 Note that this distribution of hostapd comes with configuration options that
 link it to the OpenSSL library. The OpenSSL license is GPL-incompatible,

Added: hostapd/trunk/debian/hostapd.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/hostapd.lintian-overrides?rev=1549&op=file
==============================================================================
--- hostapd/trunk/debian/hostapd.lintian-overrides (added)
+++ hostapd/trunk/debian/hostapd.lintian-overrides Tue Sep  7 18:42:54 2010
@@ -1,0 +1,3 @@
+# We distribute the package under the terms of the BSD license due to the
+# openssl issue, tell lintian to not complain:
+hostapd binary: possible-gpl-code-linked-with-openssl