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

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

Author: slh-guest
Date: Mon Feb 27 21:05:04 2012
New Revision: 1665

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1665
Log:
* update dep-5 version to final 1.0, no changes necessary:
  - order licenses alphabetically.

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=1665&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Feb 27 21:05:04 2012
@@ -4,8 +4,10 @@
   * restrict wpasupplicant to linux-any and kfreebsd-any, hurd lacks kernel
     support.
   * bump standards version to 3.9.3, no changes necessary.
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Thu, 23 Feb 2012 19:30:12 +0100
+  * update dep-5 version to final 1.0, no changes necessary:
+    - order licenses alphabetically.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 27 Feb 2012 22:04:09 +0100
 
 wpasupplicant (0.7.3-6) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/copyright?rev=1665&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/copyright (original)
+++ wpasupplicant/trunk/debian/copyright Mon Feb 27 21:05:04 2012
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: wpa_supplicant
 Upstream-Contact: Jouni Malinen <j at w1.fi>
 Source: http://w1.fi/wpa_supplicant/
@@ -86,27 +86,6 @@
            2005-2006, Devicescape Software, Inc.
 License: BSD or 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
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
@@ -138,3 +117,25 @@
  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
+ 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.
+