From 6abef8eb1f021d91014b6a680f82fdfeaebec526 Mon Sep 17 00:00:00 2001 From: Benjamin C Meyer Date: Sat, 19 Jun 2010 12:30:09 -0400 Subject: Change license of all code from the 4 clause license to the 3 clause license Signed-off-by: Benjamin C Meyer --- git_hooks/commit-msg/signed-off-by | 5 +---- git_hooks/pre-commit/bsd | 12 ++++-------- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'git_hooks') diff --git a/git_hooks/commit-msg/signed-off-by b/git_hooks/commit-msg/signed-off-by index 9fddff7..5dbafb4 100755 --- a/git_hooks/commit-msg/signed-off-by +++ b/git_hooks/commit-msg/signed-off-by @@ -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. # diff --git a/git_hooks/pre-commit/bsd b/git_hooks/pre-commit/bsd index 3080cef..3393348 100755 --- a/git_hooks/pre-commit/bsd +++ b/git_hooks/pre-commit/bsd @@ -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 } -- cgit v1.2.3