tinycompress: clarify dual-license wording

There were reports of confusion in legal circles introduced by the wording
"tinycompress is provided under LGPL and BSD dual license" in the README.

Clarify with the addition of the wording traditionally used for dual licenses:

"This file is provided under a dual BSD/LGPLv2.1 license.  When using or
redistributing this file, you may do so under either license"

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/COPYING b/COPYING
index f9639260b2fd5ec8c342f5ca491bfe9813c10892..dfc7426e5e9dd8646d654c550924825f2af0f4d5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,6 @@
+tinycompress is provided under a dual BSD/LGPLv2.1 license.  When using or
+  redistributing tinycompress, you may do so under either license.
+
 BSD LICENSE
 
 tinycompress library for compress audio offload in alsa

diff --git a/README b/README
index 73c19a60007e6dcb3c312b2f975324620b540603..689ca75e07fd8a9b4eefc61a68987db5001737e5 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,8 @@ Http: http://git.alsa-project.org/?p=tinycompress.git
 alsa-devel@alsa-project.org. 
 
 4. LICENSE
-       tinycompress is provided under LGPL and BSD dual license
+       tinycompress is provided under a dual BSD/LGPLv2.1 license.  When using or
+  redistributing tinycompress, you may do so under either license.
 
 5. CREDITS
 - Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> for library design

diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h
index 68626a42e4e7b909ac5ada9fb6176676ca393af6..780dce64a388ceb35ec0aa48de74a74fd90082d5 100644 (file)
--- a/include/tinycompress/tinycompress.h
+++ b/include/tinycompress/tinycompress.h
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * Copyright (c) 2011-2012, Intel Corporation

diff --git a/include/tinycompress/tinymp3.h b/include/tinycompress/tinymp3.h
index a709c397ee09ae32c3f03ae280fbca0561d24da7..b0d429d5cc63f6f89c1f0b1d4750034bbf31bb6e 100644 (file)
--- a/include/tinycompress/tinymp3.h
+++ b/include/tinycompress/tinymp3.h
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * mp3 header and prasing

diff --git a/include/tinycompress/version.h b/include/tinycompress/version.h
index 000f6a2688adfe61915276226399f46c6ee9a6f1..82a3e6c56fa7dda9612520b87a0129d7d9b9924f 100644 (file)
--- a/include/tinycompress/version.h
+++ b/include/tinycompress/version.h
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * Copyright (c) 2011-2012, Intel Corporation

diff --git a/src/lib/compress.c b/src/lib/compress.c
index 84738d24ff45f488d8f56ff77bd12318ed5ec626..8ae6bbda7a89efcc4f2a58a419693d0e5b1f12ff 100644 (file)
--- a/src/lib/compress.c
+++ b/src/lib/compress.c
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * tinycompress library for compress audio offload in alsa

diff --git a/src/utils/cplay.c b/src/utils/cplay.c
index 032a9711140276f5c08cab5f6de0952c4245844f..e0603fd9590558d04a59f353fb0994133956e82b 100644 (file)
--- a/src/utils/cplay.c
+++ b/src/utils/cplay.c
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * tinyplay command line player for compress audio offload in alsa

diff --git a/src/utils/crecord.c b/src/utils/crecord.c
index 1fd369881b49cac8a0487ead1cc978206136f87a..e051c2d743bceca0529a12acc5e59d35b31e97dc 100644 (file)
--- a/src/utils/crecord.c
+++ b/src/utils/crecord.c
@@ -1,4 +1,7 @@
 /*
+ * This file is provided under a dual BSD/LGPLv2.1 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
  * BSD LICENSE
  *
  * crecord command line recorder for compress audio record in alsa