Permalink
Browse files

Change license of all code from the 4 clause license to the 3 clause …

…license

Signed-off-by: Benjamin C Meyer <ben@meyerhome.net>
  • Loading branch information...
1 parent d878274 commit 6abef8eb1f021d91014b6a680f82fdfeaebec526 @icefox committed Jun 19, 2010
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
View
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
View
@@ -10,10 +10,7 @@
# 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. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Benjamin C. Meyer.
-# 4. Neither the name of the project nor the
+# 3. Neither the name of the project nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
@@ -34,10 +31,9 @@ function test_file {
if grep 'Copyright (c)' "${file}" | grep -v 'grep' >/dev/null 2>&1 ; then
set -e
grep "Redistribution and use in source and binary forms, with or without" "${file}" >/dev/null
- grep "1. Redistributions of source code must retain the above copyright" "${file}" >/dev/null
- grep "2. Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
- grep "3. All advertising materials mentioning features or use of this software" "${file}" >/dev/null
- grep "4. Neither the name of the project nor the" "${file}" >/dev/null
+ grep "Redistributions of source code must retain the above copyright" "${file}" >/dev/null
+ grep "Redistributions in binary form must reproduce the above copyright" "${file}" >/dev/null
+ grep "Neither the name of the project nor the" "${file}" >/dev/null
set +e
fi
}

0 comments on commit 6abef8e

Please sign in to comment.