totem r5404 - in trunk: . src

[gdesmott svn gnome org]

Author: gdesmott
Date: Sun May 11 11:59:15 2008
New Revision: 5404
URL: http://svn.gnome.org/viewvc/totem?rev=5404&view=rev

Log:
* COPYING
* src/totem-subtitle-encoding.c: Change licence from GPL to LGPL (closes: #515809)



Modified:
   trunk/COPYING
   trunk/ChangeLog
   trunk/src/totem-subtitle-encoding.c

Modified: trunk/COPYING
==============================================================================
--- trunk/COPYING	(original)
+++ trunk/COPYING	Sun May 11 11:59:15 2008
@@ -352,3 +352,6 @@
 
 Note that the src/backend/bacon-video-widget-xine.c file does not require such
 an exception as it does not link to GStreamer plugins.
+
+Note that the src/totem-subtitle-encoding.c file was relicensed to LGPL
+(see http://bugzilla.gnome.org/show_bug.cgi?id=515809).

Modified: trunk/src/totem-subtitle-encoding.c
==============================================================================
--- trunk/src/totem-subtitle-encoding.c	(original)
+++ trunk/src/totem-subtitle-encoding.c	Sun May 11 11:59:15 2008
@@ -3,19 +3,19 @@
  *
  * encoding list copied from gnome-terminal/encoding.c
  *
- * 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.
+ * This program 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.
  *
  * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * The Totem project hereby grant permission for non-gpl compatible GStreamer
  * plugins to be used and distributed together with GStreamer and Totem. This