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

slh-guest at users.alioth.debian.org slh-guest at users.alioth.debian.org
Wed Sep 8 01:51:19 UTC 2010 

Author: slh-guest
Date: Wed Sep  8 01:51:18 2010
New Revision: 1555

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1555
Log:
* Bump policy version to 3.9.1:
  - Include full text of the employed BSD license variant and no longer
    refer to Debian's common license template.
* update machine readable debian/copyright to be compatible with DEP5 r135.

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=1555&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Sep  8 01:51:18 2010
@@ -32,7 +32,9 @@
 
   [ Stefan Lippers-Hollmann ]
   * Add myself to uploaders.
-  * Bump policy version to 3.9.1, no changes necessary
+  * Bump policy version to 3.9.1:
+    - Include full text of the employed BSD license variant and no longer
+      refer to Debian's common license template.
   * Bump compat level to 8 and debhelper build-depends to >= 7.9.3~ 
     accordingly, retaining backportability for squeeze (plain lenny isn't an
     option due to simplified dh7 usage).
@@ -40,8 +42,9 @@
   * Drop patches applied upstream:
     - patches/10_wpa_gui_qt4_network_id_qregexp.patch
     - patches/11_wpa_supplicant_enable_network_tweak.patch
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 08 Sep 2010 03:17:44 +0200
+  * update machine readable debian/copyright to be compatible with DEP5 r135.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 08 Sep 2010 03:48:34 +0200
 
 wpasupplicant (0.6.10-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1555&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Wed Sep  8 01:51:18 2010
@@ -1,105 +1,144 @@
-Upstream-Name: wpa_supplicant
-Upstream-Maintainer: Jouni Malinen <j at w1.fi>
-Upstream-Source: http://w1.fi/wpa_supplicant/
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: wpa_supplicant
+Maintainer: Jouni Malinen <j at w1.fi>
+Source: http://w1.fi/wpa_supplicant/
 
 Files: debian/*
-Copyright: Copyright (c) 2004-2006, Kyle McMartin <kyle at debian.org>
-Copyright: Copyright (c) 2006-2008, Reinhard Tartler <siretart at tauware.de>
-Copyright: Copyright (c) 2006-2008, Kel Modderman <kel at otaku42.de>
+Copyright: 2004-2006, Kyle McMartin <kyle at debian.org>
+           2006-2008, Reinhard Tartler <siretart at tauware.de>
+           2006-2010, Kel Modderman <kel at otaku42.de>
+           2010, Stefan Lippers-Hollmann <s.l-h at gmx.de>
 License: BSD | GPL-2
 
 Files: *
-Copyright: Copyright (c) 2002-2009, Jouni Malinen <j at w1.fi> and contributors
+Copyright: 2002-2009, Jouni Malinen <j at w1.fi> and contributors
 License: BSD | GPL-2
 
 Files: src/common/wireless_copy.h
-Copyright: Copyright (c) 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
+Copyright: 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
 License: BSD | 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>
+Copyright: 2000-2005, ATMEL Corporation
+           2004-2007, Jouni Malinen <j at w1.fi>
 License: BSD | 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>
+Copyright: 2004, Nikki Chumkov <nikki at gattaca.ru>
+           2004, Jouni Malinen <j at w1.fi>
 License: BSD | GPL-2
 
 Files: src/drivers/driver_bsd.c
-Copyright: Copyright (c) 2004, Sam Leffler <sam at errno.com>
+Copyright: 2004, Sam Leffler <sam at errno.com>
 License: BSD | 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>
+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 | 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>
+Copyright: 2004, Sam Leffler <sam at errno.com>
+           2004-2005, Jouni Malinen <j at w1.fi>
 License: BSD | 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>
+Copyright: 2004-2006, Giridhar Pemmasani <giri at lmc.cs.sunysb.edu>
+           2004-2006, Jouni Malinen <j at w1.fi>
 License: BSD | 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>
+Copyright: 2003-2005, Jouni Malinen <j at w1.fi>
+           2004, Luis R. Rodriguez <mcgrof at ruslug.rutgers.edu>
 License: BSD | 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>
+Copyright: 2003-2006, Jouni Malinen <j at w1.fi>
+           2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
 License: BSD | GPL-2
 
 Files: src/drivers/driver_roboswitch.*
-Copyright: Copyright (c) 2008 Jouke Witteveen
+Copyright: 2008 Jouke Witteveen
 License: BSD | 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>
+Copyright: 2003-2005, Jouni Malinen <j at w1.fi>
+           2005, Sam Leffler <sam at errno.com>
 License: BSD | GPL-2
 
 Files: src/drivers/radiotap.c
-Copyright: Copyright (c) 2007, Andy Green <andy at warmcat.com>
+Copyright: 2007, Andy Green <andy at warmcat.com>
 License: BSD | 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
+Copyright: 2008, Ted Merrill, Atheros Communications
 License: BSD | GPL-2
 
 Files: wpa_supplicant/ctrl_iface_dbus*, wpa_supplicant/dbus_dict_helpers.*
-Copyright: Copyright (c) 2006, Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
+Copyright: 2006, Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
 License: BSD | GPL-2
 
 Files: wpa_supplicant/doc/kerneldoc2doxygen.pl
-Copyright: Copyright (c) 2003, Jonathan Foster <jon at jon-foster.co.uk>
-Copyright: Copyright (c) 2005, Jouni Malinen <j at w1.fi>
+Copyright: 2003, Jonathan Foster <jon at jon-foster.co.uk>
+           2005, Jouni Malinen <j at w1.fi>
 License: GPL-2
 
 Files: wpa_supplicant/mlme.*
-Copyright: Copyright (c) 2003-2007, Jouni Malinen <j at w1.fi>
-Copyright: Copyright (c) 2004, Instant802 Networks, Inc.
-	   (c) 2005-2006, Devicescape Software, Inc.
+Copyright: 2003-2007, Jouni Malinen <j at w1.fi>
+           2004, Instant802 Networks, Inc.
+           2005-2006, Devicescape Software, Inc.
 License: BSD | GPL-2
 
 License: GPL-2
+ 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.
+ .
+ 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.
+ .
+ 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
+ .
  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'.
+ .
+ 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: 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.
+ 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.

More information about the Pkg-wpa-devel mailing list