r1610 - in /unstable/gmerlin/debian: changelog copyright

[toots at users.alioth.debian.org]

Author: toots
Date: Mon Jan 19 00:58:09 2009
New Revision: 1610

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1610
Log:
Prepared upload..

Modified:
    unstable/gmerlin/debian/changelog
    unstable/gmerlin/debian/copyright

Modified: unstable/gmerlin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin/debian/changelog?rev=1610&op=diff
==============================================================================
--- unstable/gmerlin/debian/changelog (original)
+++ unstable/gmerlin/debian/changelog Mon Jan 19 00:58:09 2009
@@ -2,6 +2,7 @@
 
   * Adopted package for debian, with Christian Marillat's blessings.
   * Switched to cdbs.
+  * Updated debian/copyright
 
  -- Romain Beauxis <toots at rastageeks.org>  Mon, 24 Nov 2008 14:14:42 +0100
 

Modified: unstable/gmerlin/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin/debian/copyright?rev=1610&op=diff
==============================================================================
--- unstable/gmerlin/debian/copyright (original)
+++ unstable/gmerlin/debian/copyright Mon Jan 19 00:58:09 2009
@@ -5,13 +5,52 @@
 
 Upstream Author:
 
-    Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
+    Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 
 Copyright:
 
-    Copyright © 2001-2008 Burkhard Plaum
+Files lib/md5.c and include/md5.h have copyright:
+    Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+    Free Software Foundation, Inc.
+
+File lib/uthread_sem.c has copyright:
+    Copyright (C) 2000 Jason Evans <jasone at freebsd.org>
+
+Other files have copyright:
+    Copyright (c) 2001 - 2008 Members of the Gmerlin project
 
 License:
+
+File lib/uthread_sem.c has license:
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions
+   * are met:
+   * 1. Redistributions of source code must retain the above copyright
+   *    notice(s), this list of conditions and the following disclaimer as
+   *    the first lines of this file unmodified other than the possible
+   *    addition of one or more copyright notices.
+   * 2. Redistributions in binary form must reproduce the above copyright
+   *    notice(s), this list of conditions and the following disclaimer in
+   *    the documentation and/or other materials provided with the
+   *    distribution.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
+
+Other files have license:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.    
 
     You should have received a copy of the GNU General Public License with the
     Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if