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

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

Author: kelmo-guest
Date: Tue Jan 15 12:42:01 2008
New Revision: 1044

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1044
Log:
* Clarify the license of the debian packaging. No license was initially
  given until now, so we could assume the original packager contributed the
  packaging under the same terms as the upstream license (BSD | GPL-2).

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=1044&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Jan 15 12:42:01 2008
@@ -21,8 +21,11 @@
     option.
   * Truncate debian/NEWS, none of the items are relevant for current upgrade
     paths, nor do they hold any historical relevance.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 14 Jan 2008 18:33:02 +1000
+  * Clarify the license of the debian packaging. No license was initially
+    given until now, so we could assume the original packager contributed the
+    packaging under the same terms as the upstream license (BSD | GPL-2).
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 15 Jan 2008 22:39:00 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1044&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Tue Jan 15 12:42:01 2008
@@ -10,9 +10,9 @@
 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.
+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