[Trousers-scm] [GIT] Trousers master branch updated. TROUSERS_0_3_11-4-g913a7dc

[Joel Schopp]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Trousers".

The branch, master has been updated
via 913a7dc5afdf9210c198c883f2d712c277151f5b (commit)
from c701202ba0e44ea94252118119951fcd55cc45ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=913a7dc5afdf9210c198c883f2d712c277151f5b

commit 913a7dc5afdf9210c198c883f2d712c277151f5b
Author: Joel Schopp <***@linux.vnet.ibm.com>
Date: Mon Aug 19 11:22:26 2013 -0500

more post reclicense cleanup

During the recent re-license to BSD with all of the authors
approval a few files got missed that had old license details in them. Remove
those old license details so the new project wide BSD license agreed to by
all the authors clearly applies to these files as well.

Signed-off-by: Joel Schopp <***@linux.vnet.ibm.com>

diff --git a/README b/README
index 2a0ea10..a78d4b8 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
trousers README

Trousers is an open-source TCG Software Stack (TSS), released under
-the Common Public License. Trousers aims to be compliant with the
+the BSD License. Trousers aims to be compliant with the
1.1b and 1.2 TSS specifications available from the Trusted Computing
Group website:

diff --git a/dist/fedora/trousers.spec.in b/dist/fedora/trousers.spec.in
index 6b02ad0..635e713 100644
--- a/dist/fedora/trousers.spec.in
+++ b/dist/fedora/trousers.spec.in
@@ -9,7 +9,7 @@ Name: %{name}
Summary: Implementation of the TCG's Software Stack v1.1 Specification
Version: %{version}
Release: %{release}
-License: CPL
+License: BSD
Group: Development/Libraries
Source: %{name}-%{version}.tar.gz
Url: http://www.sf.net/projects/trousers
diff --git a/dist/trousers.spec.in b/dist/trousers.spec.in
index c49ece4..b298b0e 100644
--- a/dist/trousers.spec.in
+++ b/dist/trousers.spec.in
@@ -15,7 +15,7 @@ Name: %{name}
Summary: Implementation of the TCG's Software Stack v1.1 Specification
Version: %{version}
Release: %{release}
-License: CPL
+License: BSD
Group: Productivity/Security
Source: %{name}-%{version}.tar.gz
Url: http://www.sf.net/projects/trousers
diff --git a/man/man8/tcsd.8.in b/man/man8/tcsd.8.in
index bd71bc0..bdac810 100644
--- a/man/man8/tcsd.8.in
+++ b/man/man8/tcsd.8.in
@@ -34,8 +34,8 @@ tcsd \- daemon that manages Trusted Computing resources

.SH "DESCRIPTION"
.PP
-Trousers is an open-source TCG Software Stack (TSS), released under the Common
-Public License. Trousers aims to be compliant with the current (1.1b) and
+Trousers is an open-source TCG Software Stack (TSS), released under the BSD
+License. Trousers aims to be compliant with the current (1.1b) and
upcoming (1.2) TSS specifications available from the Trusted Computing Group
website: http://www.trustedcomputinggroup.org.

diff --git a/src/tspi/tspi_nv.c b/src/tspi/tspi_nv.c
index 709b6ec..25cfa29 100644
--- a/src/tspi/tspi_nv.c
+++ b/src/tspi/tspi_nv.c
@@ -3,20 +3,6 @@
* Portions created by Intel Corporation are Copyright (C) 2007 Intel Corporation.
* All Rights Reserved.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the Common Public License as published by
- * IBM Corporation; either version 1 of the License, or (at your option)
- * any later version.
- *
- * 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
- * Common Public License for more details.
- *
- * You should have received a copy of the Common Public License
- * along with this program; if not, a copy can be viewed at
- * http://www.opensource.org/licenses/cpl1.0.php.
- *
* trousers - An open source TCG Software Stack
*
* Author: ***@intel.com ***@intel.com

-----------------------------------------------------------------------

Summary of changes:
README | 2 +-
dist/fedora/trousers.spec.in | 2 +-
dist/trousers.spec.in | 2 +-
man/man8/tcsd.8.in | 4 ++--
src/tspi/tspi_nv.c | 14 --------------
5 files changed, 5 insertions(+), 19 deletions(-)


hooks/post-receive