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

Sun Jan 6 09:38:51 UTC 2008

Author: kelmo-guest
Date: Sun Jan  6 09:38:51 2008
New Revision: 1000

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1000
Log:
* Modify debian/copyright to be machine-interpretable. Annotate all
  copyright holders in new format.
* State clearly in debian/copyright that the BSD license has been chosen by
  us, the maintainers, as there is no exception to link against OpenSSL in
  the text of the given GPL-2 license.
* No license had been chosen for the debian packaging information, so GPL-2+
  has been chosen and recorded in 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=1000&op=diff
==============================================================================

--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jan  6 09:38:51 2008
@@ -75,8 +75,15 @@
     wpa_supplicant with "-f /var/log/wpa_supplicant.log" per default.
   * Add debian/patches/30_scan_even_when_disconnected.patch to allow scan
     request to succeed even when interface is in disconnected state.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 06 Jan 2008 18:30:27 +1000
+  * Modify debian/copyright to be machine-interpretable. Annotate all
+    copyright holders in new format.
+  * State clearly in debian/copyright that the BSD license has been chosen by
+    us, the maintainers, as there is no exception to link against OpenSSL in
+    the text of the given GPL-2 license.
+  * No license had been chosen for the debian packaging information, so GPL-2+
+    has been chosen and recorded in debian/copyright.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 06 Jan 2008 19:31:44 +1000
 
 wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1000&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Sun Jan  6 09:38:51 2008
@@ -6,62 +6,99 @@
 The madwifi includes were obtained from:
 	http://madwifi.org/
 
-Some components are not covered (driver_madwifi/*, driver_*.[ch]) by
-Jouni's copyright, but are licensed under GPL/BSD as wpa_supplicant, please
-see the individual files for their specific copyrights.
+Files: debian/*
+Copyright: (c) 2004-2006, Kyle McMartin <kyle at debian.org>
+	   (c) 2006-2007, Reinhard Tartler <siretart at tauware.de>
+	   (c) 2006-2008, Kel Modderman <kel at otaku42.de>
+License: GPL-2+
+  The Debian packaging information is licensed under the GNU General
+  Public License, version 2 or later.
 
-On Debian GNU systems, the GPL can be found in
-/usr/share/common-licenses/GPL, and the BSD-style license can be found
-in /usr/share/common-licenses/BSD.
+Files: *
+Copyright: (c) 2002-2007, Jouni Malinen <j at w1.fi> and contributors
+License: BSD | GPL-2
+  This program is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used. The Debian/Ubuntu
+  wpasupplicant Maintainers have chosen the BSD license, as there is
+  no OpenSSL exception in the GPLv2 license text provided with
+  wpa_supplicant, and we are linking against OpenSSL.
 
-wpa_supplicant is Copyright (c) 2003-2007, Jouni Malinen <jkmaline at cc.hut.fi>
+Files: debian/patches/20_madwifi_headers.patch
+Copyright: (c) 2002-2005, Sam Leffler, Errno Consulting <sam at errno.com>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-Jouni Malinen has a new email address: <j at w1.fi>, the old email address will be
-removed in the future.
+Files: src/common/wireless_copy.h
+Copyright: (c) 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2 as
-published by the Free Software Foundation.
+Files: src/drivers/driver_atmel.c
+Copyright: (c) 2000-2005, ATMEL Corporation
+           (c) 2004-2007, Jouni Malinen <j at w1.fi>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-This program 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 General Public License for more details.
+Files: src/drivers/driver_broadcom.c
+Copyright: (c) 2004, Nikki Chumkov <nikki at gattaca.ru>
+           (c) 2004, Jouni Malinen <j at w1.fi>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: src/drivers/driver_bsd.c
+Copyright: (c) 2004, Sam Leffler <sam at errno.com>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-(this copy of the license is in COPYING file)
+Files: src/drivers/driver_ipw.c
+Copyright: (c) 2005, Zhu Yi <yi.zhu at intel.com>
+           (c) 2004, Lubomir Gelo <lgelo at cnc.sk>
+	   (c) 2003-2004, Jouni Malinen <j at w1.fi>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
+Files: src/drivers/driver_madwifi.c
+Copyright: (c) 2004, Sam Leffler <sam at errno.com>
+           (c) 2004-2005, Jouni Malinen <j at w1.fi>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-Alternatively, this software may be distributed under the terms of BSD
-license:
+Files: src/drivers/driver_ndiswrapper.c
+Copyright: (c) 2004-2006, Giridhar Pemmasani <giri at lmc.cs.sunysb.edu>
+           (c) 2004-2006, Jouni Malinen <j at w1.fi>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Files: drivers/driver_prism54.c
+Copyright: (c) 2003-2005, Jouni Malinen <j at w1.fi>
+           (c) 2004, Luis R. Rodriguez <mcgrof at ruslug.rutgers.edu>
+License: BSD | GPL-2
+  These files are dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+Files: drivers/driver_ralink.c drivers/driver_ralink.h
+Copyright: (c) 2003-2006, Jouni Malinen <j at w1.fi>
+           (c) 2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-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.
+Files: src/l2_packet/l2_packet_freebsd.c
+Copyright: (c) 2003-2005, Jouni Malinen <j at w1.fi>
+           (c) 2005, Sam Leffler <sam at errno.com>
+License: BSD | GPL-2
+  This file is dual-licensed under both the GPL version 2 and BSD
+  license. Either license may be used.
 
-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.
-
+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' and the complete text of the BSD
+License can be found in `/usr/share/common-licenses/BSD'.


