summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--license_change19
-rw-r--r--src/plparse/totem-disc.c5
-rw-r--r--src/plugins/galago/totem-galago.c1
-rw-r--r--src/plugins/media-player-keys/totem-media-player-keys.c1
-rw-r--r--src/plugins/ontop/totem-ontop.c1
-rw-r--r--src/plugins/screensaver/totem-screensaver.c1
-rw-r--r--src/plugins/sidebar-test/totem-sidebar-test.c1
-rw-r--r--src/plugins/totem-module.c2
-rw-r--r--src/plugins/totem-module.h2
-rw-r--r--src/plugins/totem-plugin-manager.c2
-rw-r--r--src/plugins/totem-plugin-manager.h2
-rw-r--r--src/plugins/totem-plugin.c2
-rw-r--r--src/plugins/totem-plugin.h2
-rw-r--r--src/plugins/totem-plugins-engine.c2
-rw-r--r--src/plugins/totem-plugins-engine.h2
16 files changed, 57 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index d4c6cadc4..f6af640f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2007-05-13 Bastien Nocera <hadess@hadess.net>
+
+ * license_change:
+ * src/plugins/totem-module.c:
+ * src/plugins/totem-module.h:
+ * src/plugins/totem-plugin-manager.c:
+ * src/plugins/totem-plugin-manager.h:
+ * src/plugins/totem-plugin.c:
+ * src/plugins/totem-plugin.h:
+ * src/plugins/totem-plugins-engine.c:
+ * src/plugins/totem-plugins-engine.h:
+ Add exception clauses to the above mentioned filed, thanks to the
+ copyright holders for agreeing to the relicensing
+ (Closes: #435523)
+
+ * src/plugins/screensaver/totem-screensaver.c:
+ * src/plugins/media-player-keys/totem-media-player-keys.c:
+ * src/plugins/sidebar-test/totem-sidebar-test.c:
+ * src/plugins/galago/totem-galago.c:
+ * src/plugins/ontop/totem-ontop.c:
+ Remove wrong mention of a relicensing date, all those files
+ date from after the relicensing, just mention the
+ license_change file instead
+
+ * src/plparse/totem-disc.c: Update copyright, fix
+ excemption/exception again
+
2007-05-11 Bastien Nocera <hadess@hadess.net>
* src/backend/bacon-video-widget-xine.c: (xine_event_message):
diff --git a/license_change b/license_change
index 52da4f554..7b15ec274 100644
--- a/license_change
+++ b/license_change
@@ -44,3 +44,22 @@ Jonathan Blandford <jrb@redhat.com>
Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Carlos Garcia Campos <carlosgc@gnome.org>
+Bastien Nocera: Sunday 13th May 2007
+- Added exception clause to src/plugins/*.[ch]
+(See http://bugzilla.gnome.org/show_bug.cgi?id=435523 for details)
+This was done with the permission of all copyright holders as listed below:
+
+Bastien Nocera <hadess@hadess.net>
+Jesse van den Kieboom <jesse@icecrew.nl>
+Paolo Maggi <paolo@gnome.org>
+Paolo Borelli <pborelli@katamail.com>
+Steve Frécinaux <code@istique.net>
+Adam Hooper <adamh@densi.com>
+Christian Persch <chpe@svn.gnome.org
+Crispin Flowerday <gnome@flowerday.cx>
+Marco Pesenti Gritti <mpg@redhat.com>
+Jonathan Matthew <notverysmart@gmail.com>
+James "Doc" Livingston <doclivingston@gmail.com>
+William Jon McCann <mccann@jhu.edu>
+Christophe Fergeau <teuf@gnome.org>
+
diff --git a/src/plparse/totem-disc.c b/src/plparse/totem-disc.c
index f18181487..35f341446 100644
--- a/src/plparse/totem-disc.c
+++ b/src/plparse/totem-disc.c
@@ -1,5 +1,6 @@
/* Totem Disc Content Detection
- * (c) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * Copyright (C) 2004-2007 Bastien Nocera <hadess@hadess.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -21,7 +22,7 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/galago/totem-galago.c b/src/plugins/galago/totem-galago.c
index 26ed3bbfc..55671f761 100644
--- a/src/plugins/galago/totem-galago.c
+++ b/src/plugins/galago/totem-galago.c
@@ -21,7 +21,6 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/media-player-keys/totem-media-player-keys.c b/src/plugins/media-player-keys/totem-media-player-keys.c
index 567f1e015..6888ab684 100644
--- a/src/plugins/media-player-keys/totem-media-player-keys.c
+++ b/src/plugins/media-player-keys/totem-media-player-keys.c
@@ -21,7 +21,6 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/ontop/totem-ontop.c b/src/plugins/ontop/totem-ontop.c
index 0fc14de8f..3c5be92f6 100644
--- a/src/plugins/ontop/totem-ontop.c
+++ b/src/plugins/ontop/totem-ontop.c
@@ -21,7 +21,6 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/screensaver/totem-screensaver.c b/src/plugins/screensaver/totem-screensaver.c
index 21a6d4895..a69d81fe6 100644
--- a/src/plugins/screensaver/totem-screensaver.c
+++ b/src/plugins/screensaver/totem-screensaver.c
@@ -21,7 +21,6 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/sidebar-test/totem-sidebar-test.c b/src/plugins/sidebar-test/totem-sidebar-test.c
index 4ce84b87c..4a64dc3da 100644
--- a/src/plugins/sidebar-test/totem-sidebar-test.c
+++ b/src/plugins/sidebar-test/totem-sidebar-test.c
@@ -21,7 +21,6 @@
* permission are above and beyond the permissions granted by the GPL license
* Totem is covered by.
*
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-module.c b/src/plugins/totem-module.c
index 4b1e569ba..bc5e090a8 100644
--- a/src/plugins/totem-module.c
+++ b/src/plugins/totem-module.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-module.h b/src/plugins/totem-module.h
index f6f47ed46..d485f40d1 100644
--- a/src/plugins/totem-module.h
+++ b/src/plugins/totem-module.h
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugin-manager.c b/src/plugins/totem-plugin-manager.c
index 435ab630a..78bd90a53 100644
--- a/src/plugins/totem-plugin-manager.c
+++ b/src/plugins/totem-plugin-manager.c
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugin-manager.h b/src/plugins/totem-plugin-manager.h
index 42463fb45..6db825b7c 100644
--- a/src/plugins/totem-plugin-manager.h
+++ b/src/plugins/totem-plugin-manager.h
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugin.c b/src/plugins/totem-plugin.c
index 5e9252cde..cd177da82 100644
--- a/src/plugins/totem-plugin.c
+++ b/src/plugins/totem-plugin.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugin.h b/src/plugins/totem-plugin.h
index 450562b1d..851d0a485 100644
--- a/src/plugins/totem-plugin.h
+++ b/src/plugins/totem-plugin.h
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
index f05d3ca8c..160c8bac6 100644
--- a/src/plugins/totem-plugins-engine.c
+++ b/src/plugins/totem-plugins-engine.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
diff --git a/src/plugins/totem-plugins-engine.h b/src/plugins/totem-plugins-engine.h
index af18cf0c1..ce376dbbf 100644
--- a/src/plugins/totem-plugins-engine.h
+++ b/src/plugins/totem-plugins-engine.h
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
- * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * Sunday 13th May 2007: Bastien Nocera: Add exception clause.
* See license_change file for details.
*
*/
View Lorry Controller Status