From 3973638f53e756c32fad2a0bf571e37fbb7f2bc9 Mon Sep 17 00:00:00 2001
From: Zheng Chai <zheng.chai@citrix.com>
Date: Thu, 4 Jun 2015 11:37:55 +0000
Subject: CP-12326: refine the license text

Signed-off-by: Zheng Chai <zheng.chai@citrix.com>
---
 mk/Makefile.deb               |  4 ++--
 mk/Makefile.rpm               |  2 +-
 mk/xe-guest-utilities.spec.in |  2 +-
 mk/xe-linux-distribution      | 38 +++++++++++++++++++++++---------------
 4 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'mk')

diff --git a/mk/Makefile.deb b/mk/Makefile.deb
index c9566b4..0c9f44f 100644
--- a/mk/Makefile.deb
+++ b/mk/Makefile.deb
@@ -129,8 +129,8 @@ $(DEB_BUILT_COOKIE): $(SOURCES)
 	touch $@
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
-	( echo "$(COMPONENT) GPL file $(MY_OUTPUT_DIR)/$(DEBPOOLDIR)/$(PACKAGE)_$(VERSION)-$(RELEASE).dsc" ; \
-	  echo "$(COMPONENT) GPL file $(MY_OUTPUT_DIR)/$(DEBPOOLDIR)/$(PACKAGE)_$(VERSION)-$(RELEASE).tar.gz" ; \
+	( echo "$(COMPONENT) BSD 2-Clause file $(MY_OUTPUT_DIR)/$(DEBPOOLDIR)/$(PACKAGE)_$(VERSION)-$(RELEASE).dsc" ; \
+	  echo "$(COMPONENT) BSD 2-Clause file $(MY_OUTPUT_DIR)/$(DEBPOOLDIR)/$(PACKAGE)_$(VERSION)-$(RELEASE).tar.gz" ; \
         ) >$@
 
 .PHONY: sources
diff --git a/mk/Makefile.rpm b/mk/Makefile.rpm
index b4d54a7..f379715 100644
--- a/mk/Makefile.rpm
+++ b/mk/Makefile.rpm
@@ -86,7 +86,7 @@ $(RPM_BUILT_COOKIE): $(RPM_DIRECTORIES) $(RPM_SPECSDIR)/$(SPEC) $(SOURCES)
 	done
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
-	( echo "$(COMPONENT) GPL file $(RPM_SRPMSDIR)/$(SRPM)" ; \
+	( echo "$(COMPONENT) BSD 2-Clause file $(RPM_SRPMSDIR)/$(SRPM)" ; \
         ) >$@
 
 .PHONY: sources
diff --git a/mk/xe-guest-utilities.spec.in b/mk/xe-guest-utilities.spec.in
index 686b7e2..9726d7f 100644
--- a/mk/xe-guest-utilities.spec.in
+++ b/mk/xe-guest-utilities.spec.in
@@ -4,7 +4,7 @@ Summary: @BRAND_GUEST@ Monitoring Scripts
 Name: xe-guest-utilities
 Version: @VERSION@
 Release: @RELEASE@
-License: GPL/LGPL
+License: BSD 2-Clause
 Group: Xen
 URL: http://www.citrix.com
 Vendor: @COMPANY_NAME_LEGAL@
diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution
index 054a58a..5013e4f 100755
--- a/mk/xe-linux-distribution
+++ b/mk/xe-linux-distribution
@@ -1,20 +1,28 @@
 #! /bin/sh
 
-# Copyright (C) 2009  Citrix Systems Inc.
-#
-# 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 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.
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Copyright (c) 2015, Citrix Systems
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without modification,
+# 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.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
 
 # Script to write information about the current distribution to stdout or a file.
 # Information collected:
-- 
cgit v1.2.3