fix licensing of monoscope

Original commit message from CVS:
fix licensing of monoscope

diff --git a/ChangeLog b/ChangeLog
index 4ea52df..84ffb08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-07  Christian Fredrik Kalager Schaller  <set EMAIL_ADDRESS environment variable>
+
+       Woooho Monoscope is now effectivly LGPL licensed
+
+       * gst/monoscope/README: remove blurb about files being GPL
+       * gst/monoscope/gstmonoscope.c: Change license field to LGPL
+       * gst/monoscope/monoscope.c: Change license to BSD with explanation
+
 2004-12-07  Christian Fredrik Kalager Schaller  <uraeus@gnome.org>
 
        * gst/monoscope/README: Update information to be more correct

diff --git a/gst/monoscope/README b/gst/monoscope/README
index 0291131..5c85e80 100644 (file)
--- a/gst/monoscope/README
+++ b/gst/monoscope/README
@@ -3,9 +3,7 @@ alsaplayer.
 
 The monoscope convolution matching code was written by Ralph Loader.
 
-The monoscope.c and monoscope.h files are the only ones under the GPL,
-as opposed to the LGPL. We need to either rewrite these or get permission
-from the people involved to do so.
+The monoscope.c and monoscope.h files are under the BSD license (without advertising clause). 
 
 This implementation is taken from alsaplayer version 0.99.54, at
 http://www.alsaplayer.org/

diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 5be9d8d..581560c 100644 (file)
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -300,4 +300,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "monoscope",
     "Monoscope visualization",
-    plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)

diff --git a/gst/monoscope/monoscope.c b/gst/monoscope/monoscope.c
index c8c32ac..b3fce24 100644 (file)
--- a/gst/monoscope/monoscope.c
+++ b/gst/monoscope/monoscope.c
@@ -3,21 +3,37 @@
  *  Copyright (C) 1998-2001 Andy Lo A Foe <andy@alsaplayer.org>
  *  Original code by Tinic Uro
  *
- *  This code is copied from Alsaplayer.
+ *  This code is copied from Alsaplayer. The orginal code was by Tinic Uro and under
+ *  the BSD license without a advertisig clause. Andy Lo A Foe then relicensed the
+ *  code when he used it for Alsaplayer to GPL with Tinic's permission. Richard Boulton
+ *  then took this code and made a GPL plugin out of it.
+ * 
+ *  7th December 2004 Christian Schaller: Richard Boulton and Andy Lo A Foe gave
+ *  permission to relicense their changes under BSD license so we where able to restore the 
+ *  code to Tinic's original BSD 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.
+ * This file is under what is known as the BSD license:
  *
- *  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.
+ * Redistribution and use in source and binary forms, with or without modification, i
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products derived from 
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H