Add the GPL exception. Fixes #551868.

2008-09-14 Jonathan Matthew <[email protected]> * COPYING: Add the GPL exception. Fixes #551868. svn path=/trunk/; revision=5919
MFAshby · Sep 14, 2008 · ec74918 · ec74918
1 parent aeb0c9d
commit ec74918
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/COPYING b/COPYING
@@ -1,3 +1,6 @@
+# This GPL license have a exception clause added, see at the bottom of file
+# for details.
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -338,3 +341,12 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
+
+The Rhythmbox authors hereby grant permission for non-GPL compatible
+GStreamer plugins to be used and distributed together with GStreamer and
+Rhythmbox. This permission is above and beyond the permissions granted by
+the GPL license by which Rhythmbox 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.
+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-14  Jonathan Matthew  <[email protected]>
+
+	* COPYING:  Add the GPL exception.  Fixes #551868.
+
 2008-09-14  Jonathan Matthew  <[email protected]>
 
 	patch by:  Eric Shattow  <[email protected]>