[Pkg-pulseaudio-devel] r86 - in /padevchooser/trunk/debian: changelog copyright

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Oct 20 21:56:31 2006
New Revision: 86

URL: http://svn.debian.org/wsvn/pkg-pulseaudio/?sc=1&rev=86
Log:
* Clarify copyright and licenses mixtures.

Modified:
    padevchooser/trunk/debian/changelog
    padevchooser/trunk/debian/copyright

Modified: padevchooser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/padevchooser/trunk/debian/changelog?rev=86&op=diff
==============================================================================
--- padevchooser/trunk/debian/changelog (original)
+++ padevchooser/trunk/debian/changelog Fri Oct 20 21:56:31 2006
@@ -1,6 +1,10 @@
 padevchooser (0.9.3-1) unstable; urgency=low
 
+  [ CJ van den Berg ]
   * Initial release
 
- -- CJ van den Berg <cj at vdbonline.com>  Thu, 21 Sep 2006 00:58:30 +0200
+  [ Loic Minier ]
+  * Clarify copyright and licenses mixtures.
 
+ -- Loic Minier <lool at dooz.org>  Fri, 20 Oct 2006 23:56:11 +0200
+

Modified: padevchooser/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-pulseaudio/padevchooser/trunk/debian/copyright?rev=86&op=diff
==============================================================================
--- padevchooser/trunk/debian/copyright (original)
+++ padevchooser/trunk/debian/copyright Fri Oct 20 21:56:31 2006
@@ -5,9 +5,42 @@
 
 Upstream Author: Lennart Poettering <mzcnihpbageby at 0pointer.de>
 
-Copyright: 2006 Lennart Poettering
+Copyrights:
+    Most files are Copyright 2006 Lennart Poettering
+    src/eggtrayicon.h and .c are:
+       Copyright (C) 2002 Anders Carlsson <andersca at gnu.org>
 
 License:
+
+ The packages should end up being 100% GPL, but for now it is a mixture
+ of LGPL and GPL sources.
+
+ src/eggtrayicon.c and .h are licensed under the LGPL version 2 or
+ later; this is not expected to change until this support is added to a
+ library.
+   Other *.c and *.h files under src/ are licensed under the LGPL version
+ 2 or later as well; this is expected to be relicensed to the GPL
+ soonish; doc/style.css is also under the LGPL:
+  padevchooser is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  padevchooser 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 Lesser General Public License
+  along with padevchooser; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+ And when not otherwise stated other files are licensed under the GPL
+ version 2 or later:
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,9 +58,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The files src/eggtrayicon.h and src/eggtrayicon.c are Copyright (C) 2002
-Anders Carlsson <andersca at gnu.org> and licensed under the terms of the GNU
-Lesser General Public License. On Debian systems, the complete text of the
-GNU Lesser General Public License can be found in
-`/usr/share/common-licenses/LGPL'.