[pkg-wpa-devel] r1337 - in /wpasupplicant/trunk/debian: changelog copyright

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Mar 12 19:09:37 2009
New Revision: 1337

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1337
Log:
* Add note about linkage with OpenSSL and impact it has on the choice
  of BSD license in lieu of GPL imcompatibility to debian/copyright.
* Add copyright information about src/wps/httpread.* to
  debian/copyright.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/copyright

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1337&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Mar 12 19:09:37 2009
@@ -15,8 +15,12 @@
     pedantic lintian suggestion.
   * Upload to unstable.
   * Add copyright information for src/wps/wps* to debian/copyright.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 16 Feb 2009 06:49:33 +1000
+  * Add note about linkage with OpenSSL and impact it has on the choice
+    of BSD license in lieu of GPL imcompatibility to debian/copyright.
+  * Add copyright information about src/wps/httpread.* to
+    debian/copyright.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 13 Mar 2009 05:08:31 +1000
 
 wpasupplicant (0.6.7-1) experimental; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1337&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Thu Mar 12 19:09:37 2009
@@ -73,8 +73,8 @@
 Copyright: Copyright (c) 2003-2004,  David Young
 License: BSD
 
-Files: src/wps/wps*
-Copyright: Copyright (c) 2007 - 2008, Jouni Malinen <j at w1.fi>
+Files: src/wps/httpread.*
+Copyright: Copyright (c) 2008, Ted Merrill, Atheros Communications
 License: BSD | GPL-2
 
 Files: wpa_supplicant/ctrl_iface_dbus*, wpa_supplicant/dbus_dict_helpers.*
@@ -99,3 +99,7 @@
 License: BSD
   On Debian GNU/Linux systems, the complete text of the BSD License can be
   found in `/usr/share/common-licenses/BSD'.
+
+Note that this distribution of hostapd comes with configuration options that
+link it to the OpenSSL library. The OpenSSL license is GPL-incompatible,
+therefore in this distribution only the BSD license applies.