r1639 - in /unstable/gmerlin-avdecoder/debian: changelog copyright

[toots at users.alioth.debian.org]

Author: toots
Date: Tue Jun  9 14:19:55 2009
New Revision: 1639

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1639
Log:
Updated debian/copyright

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

Modified: unstable/gmerlin-avdecoder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/changelog?rev=1639&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/changelog (original)
+++ unstable/gmerlin-avdecoder/debian/changelog Tue Jun  9 14:19:55 2009
@@ -12,7 +12,8 @@
   * Added build-dep on libvorbis-dev. 
   * Added build-dep on libfaad-dev.
   * Added build-dep on liba52-0.7.4-dev.
-
+  * Updated debian/copyright.
+ 
  -- Romain Beauxis <toots at rastageeks.org>  Tue, 09 Jun 2009 12:01:51 +0200
 
 gmerlin-avdecoder (1.0.0-0.2) unstable; urgency=low

Modified: unstable/gmerlin-avdecoder/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/gmerlin-avdecoder/debian/copyright?rev=1639&op=diff
==============================================================================
--- unstable/gmerlin-avdecoder/debian/copyright (original)
+++ unstable/gmerlin-avdecoder/debian/copyright Tue Jun  9 14:19:55 2009
@@ -13,6 +13,24 @@
 
 License:
 
+Files in lib/GSM160 have the following license:
+    Any use of this software is permitted provided that this notice is not
+    removed and that neither the authors nor the Technische Universitaet Berlin
+    are deemed to have made any representations as to the suitability of this
+    software for any purpose nor are held responsible for any defects of
+    this software.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+
+Files lib/targa.{c,h} have the following license:
+    Source and binary redistribution of this code, with or without changes, for
+    free or for profit, is allowed as long as this copyright notice is kept
+    intact.  Modified versions must be clearly marked as modified.
+
+Other files have this 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-2; if
     not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth