r95 - unstable/alogg/trunk/debian

[sho at alioth.debian.org]

Author: sho
Date: 2007-12-20 07:31:27 +0000 (Thu, 20 Dec 2007)
New Revision: 95

Modified:
   unstable/alogg/trunk/debian/changelog
   unstable/alogg/trunk/debian/copyright
Log:
  * debian/copyright:
    + Improved debian/copyright file.


Modified: unstable/alogg/trunk/debian/changelog
===================================================================
--- unstable/alogg/trunk/debian/changelog	2007-12-15 15:01:55 UTC (rev 94)
+++ unstable/alogg/trunk/debian/changelog	2007-12-20 07:31:27 UTC (rev 95)
@@ -50,6 +50,8 @@
       therefore include <vorbis/vorbisfile.h>.
   * debian/patches/debian/patches/020_info.diff:
     + Updated patch. Fix final info page format.
+  * debian/copyright:
+    + Improved debian/copyright file.
 
   [ Loic Minier ]
   * Drop useless debian/libalogg.postinst.
@@ -59,7 +61,7 @@
   * Add Vcs-Browser and Vcs-Svn URLs.
   * Remove the .pc tree after quilt pop -a.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 15 Dec 2007 15:00:42 +0000
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 20 Dec 2007 08:30:54 +0100
 
 alogg (1.3.3-5) unstable; urgency=low
 

Modified: unstable/alogg/trunk/debian/copyright
===================================================================
--- unstable/alogg/trunk/debian/copyright	2007-12-15 15:01:55 UTC (rev 94)
+++ unstable/alogg/trunk/debian/copyright	2007-12-20 07:31:27 UTC (rev 95)
@@ -3,17 +3,24 @@
 
 It was downloaded from http://lyrian.obnix.com/alogg/
 
-Upstream Author: Vincent Penquerc'h <lyrian at kezako.net>
+   Copyright (c) 2001, 2002, 2003 Vincent Penquerc'h (alogg)
+   Copyright (c) 2001, Xiphophorus (vorbis examples)
 
-Copyright:
-
 The alogg distribution is licensed on the terms of three different licenses:
 
-- The core (alogg.h, alogg.c) is LGPL-like :
-  On Debian systems, the complete text of the LGPG license can 
-  be found in the file `/usr/share/common-licenses/LGPG'
+- The core (alogg.c, alogg.h, aloggint.h, aloggpth.c, aloggpth.h,
+aloggurl.c, aloggurl.h, _alst.c) is released under the LGPL:
 
-- The grabber plugin is giftware :
+   The alogg library 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.1 of the License, or (at your option) any later version.
+
+   On Debian systems, the complete text of the LGPL license can 
+   be found in the file `/usr/share/common-licenses/LGPL'
+
+- The grabber plugin (dattog.c, datogg.inc) is gift-ware:
+
    Allegro and the alogg grabber plugin are gift-ware. They were created by
    a number of people working in cooperation, and are given to you freely as
    a gift. You may use, modify, redistribute, and generally hack them about
@@ -28,8 +35,34 @@
    credits, but you are not required to do this. We trust you not to abuse
    our generosity.
 
-- The examples are BSD-like
-  On Debian systems, the complete text of the BSD license can 
-  be found in the file `/usr/share/common-licenses/BSD'.
+- The examples (alogg_dat.c, alogg_encode.c, alogg_play.c, alogg_stream.c,
+alogg_thread.c) are BSD-like:
 
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
 
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - 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.
+
+   - Neither the name of Vincent Penquerc'h nor alogg nor Xiphophorus
+   nor the names of their 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 REGENTS 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. */
+