r20421 - in /desktop/unstable/brasero/debian: changelog copyright

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

Author: pochu-guest
Date: Sat Jun 20 21:59:58 2009
New Revision: 20421

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20421
Log:
debian/copyright: updated.

Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/copyright

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=20421&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog (original)
+++ desktop/unstable/brasero/debian/changelog Sat Jun 20 21:59:58 2009
@@ -50,6 +50,9 @@
     menu, and nautilus autorun).
   * Update list of copyright holders.
 
+  [ Emilio Pozuelo Monfort ]
+  * debian/copyright: updated.
+
  -- Josselin Mouette <joss at debian.org>  Mon, 15 Jun 2009 23:40:00 +0200
 
 brasero (0.8.1-1) unstable; urgency=low

Modified: desktop/unstable/brasero/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/copyright?rev=20421&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/copyright (original)
+++ desktop/unstable/brasero/debian/copyright Sat Jun 20 21:59:58 2009
@@ -21,8 +21,27 @@
     Copyright (C) 2001 George Lebl
 
 
-License for Brasero itself, the plugins and for some parts of the 
-library:
+License for Brasero:
+
+   Brasero 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 3 of the License, or
+   (at your option) any later version.
+
+   Brasero 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, see <http://www.gnu.org/licenses/>.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+
+libbrasero-media is licensed under the following terms:
 
    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
@@ -38,11 +57,19 @@
    along with this package; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+   The Libbrasero-media authors hereby grant permission for non-GPL compatible
+   GStreamer plugins to be used and distributed together with GStreamer
+   and Libbrasero-media. This permission is above and beyond the permissions granted
+   by the GPL license by which Libbrasero-media is covered. If you modify this code
+   you may extend this exception to your version of the code, but you are not
+   obligated to do so. If you do not wish to do so, delete this exception
+   statement from your version.
+
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
-License for most parts of the library:
+License for src/egg* and src/baobab*:
 
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -60,3 +87,14 @@
 
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The help is licensed under the GFDL:
+
+          Permission is granted to copy, distribute and/or modify this
+          document under the terms of the GNU Free Documentation
+          License (GFDL), Version 1.1 or any later version published
+          by the Free Software Foundation with no Invariant Sections,
+          no Front-Cover Texts, and no Back-Cover Texts.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/GFDL'.