[pkg-wpa-devel] r1666 - in /hostapd/trunk/debian: changelog copyright
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Mon Feb 27 21:17:19 UTC 2012
Author: slh-guest
Date: Mon Feb 27 21:17:17 2012
New Revision: 1666
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1666
Log:
* update dep-5 version to final 1.0:
- add format qualifier
- s/Upstream-Maintainer/Upstream-Contact/
- s/Upstream-Source/Source/
- use "or" instead of "BSD | GPL-2" for dual-licensed sources
- order licenses alphabetically.
- fix lists of copyright holders for the final syntax
- fix license continuation.
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=1666&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Mon Feb 27 21:17:17 2012
@@ -2,8 +2,16 @@
* NOT RELEASED YET
* bump standards version to 3.9.3, no changes necessary.
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Thu, 23 Feb 2012 19:31:52 +0100
+ * update dep-5 version to final 1.0:
+ - add format qualifier
+ - s/Upstream-Maintainer/Upstream-Contact/
+ - s/Upstream-Source/Source/
+ - use "or" instead of "BSD | GPL-2" for dual-licensed sources
+ - order licenses alphabetically.
+ - fix lists of copyright holders for the final syntax
+ - fix license continuation.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Mon, 27 Feb 2012 22:07:19 +0100
hostapd (1:0.7.3-4) unstable; urgency=low
Modified: hostapd/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/copyright?rev=1666&op=diff
==============================================================================
--- hostapd/trunk/debian/copyright (original)
+++ hostapd/trunk/debian/copyright Mon Feb 27 21:17:17 2012
@@ -1,114 +1,111 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: hostapd
-Upstream-Maintainer: Jouni Malinen <j at w1.fi>
-Upstream-Source: http://w1.fi/hostapd/
+Upstream-Contact: Jouni Malinen <j at w1.fi>
+Source: http://w1.fi/hostapd/
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
+Copyright: 2007-2009, Kel Modderman <kel at otaku42.de>
+ 2005-2009, Faidon Liambotis <paravoid at debian.org>
+ 2010, Jan Dittberner <jandd at debian.org>
+License: BSD or GPL-2
Files: debian/driver_madwifi/*
-Copyright: Copyright (c) 2001 Atsushi Onoe
-Copyright: Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
-License: BSD | GPL-2
+Copyright: 2001 Atsushi Onoe
+ 2002-2005 Sam Leffler, Errno Consulting
+License: BSD or GPL-2
Files: *
-Copyright: Copyright (c) 2002-2009, Jouni Malinen <j at w1.fi> and contributors
-License: BSD | GPL-2
+Copyright: 2002-2009, Jouni Malinen <j at w1.fi> and contributors
+License: BSD or GPL-2
Files: src/common/wireless_copy.h
-Copyright: Copyright (c) 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
-License: BSD | GPL-2
+Copyright: 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
+License: BSD or GPL-2
Files: hostapd/driver_atheros.c
-Copyright: Copyright (c) 2004, Sam Leffler <sam at errno.com>
-Copyright: Copyright (c) 2004, Video54 Technologies
-Copyright: Copyright (c) 2005-2007, Jouni Malinen <j at w1.fi>
-Copyright: Copyright (c) 2009, Atheros Communications
-License: BSD | GPL-2
+Copyright: 2004, Sam Leffler <sam at errno.com>
+ 2004, Video54 Technologies
+ 2005-2007, Jouni Malinen <j at w1.fi>
+ 2009, Atheros Communications
+License: BSD or GPL-2
Files: src/drivers/driver_atmel.c
-Copyright: Copyright (c) 2000-2005, ATMEL Corporation
-Copyright: Copyright (c) 2004-2007, Jouni Malinen <j at w1.fi>
-License: BSD | GPL-2
+Copyright: 2000-2005, ATMEL Corporation
+ 2004-2007, Jouni Malinen <j at w1.fi>
+License: BSD or GPL-2
Files: src/drivers/driver_broadcom.c
-Copyright: Copyright (c) 2004, Nikki Chumkov <nikki at gattaca.ru>
-Copyright: Copyright (c) 2004, Jouni Malinen <j at w1.fi>
-License: BSD | GPL-2
+Copyright: 2004, Nikki Chumkov <nikki at gattaca.ru>
+ 2004, Jouni Malinen <j at w1.fi>
+License: BSD or GPL-2
Files: src/drivers/driver_bsd.c
-Copyright: Copyright (c) 2004, Sam Leffler <sam at errno.com>
-License: BSD | GPL-2
+Copyright: 2004, Sam Leffler <sam at errno.com>
+License: BSD or GPL-2
Files: src/drivers/driver_ipw.c
-Copyright: Copyright (c) 2005, Zhu Yi <yi.zhu at intel.com>
-Copyright: Copyright (c) 2004, Lubomir Gelo <lgelo at cnc.sk>
-Copyright: Copyright (c) 2003-2004, Jouni Malinen <j at w1.fi>
-License: BSD | GPL-2
+Copyright: 2005, Zhu Yi <yi.zhu at intel.com>
+ 2004, Lubomir Gelo <lgelo at cnc.sk>
+ 2003-2004, Jouni Malinen <j at w1.fi>
+License: BSD or GPL-2
Files: src/drivers/driver_madwifi.c
-Copyright: Copyright (c) 2004, Sam Leffler <sam at errno.com>
-Copyright: Copyright (c) 2004-2005, Jouni Malinen <j at w1.fi>
-License: BSD | GPL-2
+Copyright: 2004, Sam Leffler <sam at errno.com>
+ 2004-2005, Jouni Malinen <j at w1.fi>
+License: BSD or GPL-2
Files: src/drivers/driver_ndiswrapper.c
-Copyright: Copyright (c) 2004-2006, Giridhar Pemmasani <giri at lmc.cs.sunysb.edu>
-Copyright: Copyright (c) 2004-2006, Jouni Malinen <j at w1.fi>
-License: BSD | GPL-2
+Copyright: 2004-2006, Giridhar Pemmasani <giri at lmc.cs.sunysb.edu>
+ 2004-2006, Jouni Malinen <j at w1.fi>
+License: BSD or GPL-2
Files: src/drivers/driver_prism54.c
-Copyright: Copyright (c) 2003-2005, Jouni Malinen <j at w1.fi>
-Copyright: Copyright (c) 2004, Luis R. Rodriguez <mcgrof at ruslug.rutgers.edu>
-License: BSD | GPL-2
+Copyright: 2003-2005, Jouni Malinen <j at w1.fi>
+ 2004, Luis R. Rodriguez <mcgrof at ruslug.rutgers.edu>
+License: BSD or GPL-2
Files: src/drivers/driver_ralink.*
-Copyright: Copyright (c) 2003-2006, Jouni Malinen <j at w1.fi>
-Copyright: Copyright (c) 2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
-License: BSD | GPL-2
+Copyright: 2003-2006, Jouni Malinen <j at w1.fi>
+ 2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
+License: BSD or GPL-2
Files: src/drivers/driver_roboswitch.*
-Copyright: Copyright (c) 2008 Jouke Witteveen
-License: BSD | GPL-2
+Copyright: 2008 Jouke Witteveen
+License: BSD or GPL-2
Files: src/l2_packet/l2_packet_freebsd.c
-Copyright: Copyright (c) 2003-2005, Jouni Malinen <j at w1.fi>
-Copyright: Copyright (c) 2005, Sam Leffler <sam at errno.com>
-License: BSD | GPL-2
+Copyright: 2003-2005, Jouni Malinen <j at w1.fi>
+ 2005, Sam Leffler <sam at errno.com>
+License: BSD or GPL-2
Files: src/drivers/radiotap.c
-Copyright: Copyright (c) 2007, Andy Green <andy at warmcat.com>
-License: BSD | GPL-2
+Copyright: 2007, Andy Green <andy at warmcat.com>
+License: BSD or GPL-2
Files: src/drivers/radiotap.h
-Copyright: Copyright (c) 2003-2004, David Young
+Copyright: 2003-2004, David Young
License: BSD
Files: src/wps/httpread.*
-Copyright: Copyright (c) 2008, Ted Merrill, Atheros Communications
-License: BSD | GPL-2
-
-License: GPL-2
- 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'.
+Copyright: 2008, Ted Merrill, Atheros Communications
+License: BSD or GPL-2
License: 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
@@ -120,7 +117,12 @@
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,
+ therefore in this distribution only the BSD license applies.
-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.
+License: GPL-2
+ 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'.
+
More information about the Pkg-wpa-devel
mailing list