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

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Wed Oct 8 21:52:37 UTC 2008 

Author: kelmo-guest
Date: Wed Oct  8 21:52:37 2008
New Revision: 1269

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1269
Log:
Update debian/copyright for new files, as well as better conformance with
prpposed copyright format.

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=1269&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Oct  8 21:52:37 2008
@@ -13,8 +13,10 @@
   * Rename 20_wpa_gui_menu_exec_path.patch to
     06_wpa_gui_menu_exec_path.patch, it will possibly be a long term
     patch.
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 09 Oct 2008 07:23:24 +1000
+  * Update debian/copyright for new files, as well as better conformance with
+    prpposed copyright format.
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 09 Oct 2008 07:49:11 +1000
 
 wpasupplicant (0.6.4-3) experimental; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1269&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Wed Oct  8 21:52:37 2008
@@ -1,120 +1,93 @@
-This package was Debian-ized by Kyle McMartin <kyle at debian.org>
-
-The wpa_supplicant sources were obtained from:
-	http://w1.fi/wpa_supplicant/
-
-The madwifi includes were obtained from:
-	http://madwifi.org/
+Upstream-Name: wpa_supplicant
+Upstream-Maintainer: Jouni Malinen <j at w1.fi>
+Upstream-Source: http://w1.fi/wpa_supplicant/
 
 Files: debian/*
-Copyright: (c) 2004-2006, Kyle McMartin <kyle at debian.org>
-	   (c) 2006-2008, Reinhard Tartler <siretart at tauware.de>
-	   (c) 2006-2008, Kel Modderman <kel at otaku42.de>
+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>
 License: BSD | GPL-2
-  The Debian packaging information is dual-licensed under both the GPL
-  version 2 and BSD license. The same as the upstream license.
 
 Files: *
-Copyright: (c) 2002-2007, Jouni Malinen <j at w1.fi> and contributors
+Copyright: 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.
 
 Files: src/common/wireless_copy.h
-Copyright: (c) 1997-2005, Jean Tourrilhes <jt at hpl.hp.com>
+Copyright: 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.
 
 Files: src/drivers/driver_atmel.c
-Copyright: (c) 2000-2005, ATMEL Corporation
-           (c) 2004-2007, Jouni Malinen <j at w1.fi>
+Copyright: Copyright (c) 2000-2005, ATMEL Corporation
+Copyright: Copyright (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.
 
 Files: src/drivers/driver_broadcom.c
-Copyright: (c) 2004, Nikki Chumkov <nikki at gattaca.ru>
-           (c) 2004, Jouni Malinen <j at w1.fi>
+Copyright: Copyright (c) 2004, Nikki Chumkov <nikki at gattaca.ru>
+Copyright: Copyright (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.
 
 Files: src/drivers/driver_bsd.c
-Copyright: (c) 2004, Sam Leffler <sam at errno.com>
+Copyright: 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.
 
 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>
+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
-  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>
+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
-  This file is dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
 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>
+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
-  This file is dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
-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>
+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
-  This files is dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
-Files: drivers/driver_ralink.*
-Copyright: (c) 2003-2006, Jouni Malinen <j at w1.fi>
-           (c) 2007, Snowpin Lee <snowpin_lee at ralinktech.com.tw>
+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
-  This file is dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
 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>
+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
-  This file is dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
-Files: wpa_supplicant/ctrl_iface_dbus.*
-       wpa_supplicant/ctrl_iface_dbus_handlers.*
-       wpa_supplicant/dbus_dict_helpers.*
-Copyright: (c) 2006, Dan Williams <dcbw at redhat.com> and Red Hat, Inc.
+Files: src/drivers/radiotap.c
+Copyright: Copyright (c) 2007, Andy Green <andy at warmcat.com>
 License: BSD | GPL-2
-  These files are dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
+
+Files: src/drivers/radiotap.h
+Copyright: Copyright (c) 2003-2004,  David Young
+License: BSD
+
+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.
+License: BSD | GPL-2
 
 Files: wpa_supplicant/doc/kerneldoc2doxygen.pl
-Copyright: (c) 2003, Jonathan Foster <jon at jon-foster.co.uk>
-           (c) 2005, Jouni Malinen <j at w1.fi>
+Copyright: Copyright (c) 2003, Jonathan Foster <jon at jon-foster.co.uk>
+Copyright: Copyright (c) 2005, Jouni Malinen <j at w1.fi>
 License: GPL-2
-  This file is licensed under both the GPL version 2.
 
 Files: wpa_supplicant/mlme.*
-Copyright: (c) 2003-2007, Jouni Malinen <j at w1.fi>
-           (c) 2004, Instant802 Networks, Inc.
+Copyright: Copyright (c) 2003-2007, Jouni Malinen <j at w1.fi>
+Copyright: Copyright (c) 2004, Instant802 Networks, Inc.
 	   (c) 2005-2006, Devicescape Software, Inc.
 License: BSD | GPL-2
-  These files are dual-licensed under both the GPL version 2 and BSD
-  license. Either license may be used.
 
-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'.
+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'.
+
+License: BSD
+  On Debian GNU/Linux systems, the complete text of the BSD License can be
+  found in `/usr/share/common-licenses/BSD'.

More information about the Pkg-wpa-devel mailing list