List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:December 1 2010 5:55pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:947)
View as plain text  
#At file:///C:/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  947 Reggie Burnett	2010-12-01 [merge]

=== modified file 'Installer/core.wxs'
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-11-17 19:25:46 +0000
+++ b/Installer/core.wxs	2010-12-01 17:55:00 +0000
@@ -11,8 +11,9 @@
         <?if $(var.IsGPL) = 1 ?>
         <File Id="COPYING" Name="COPYING" Source="..\COPYING" DiskId="1" />
         <File Id="README1" Name="README" Source="..\README" DiskId="1"/>
-	<?else?>
+	      <?else?>
         <File Id="README2" Name="README" Source="..\README-Commercial" DiskId="1"/>
+        <File Id="License.MYSQL" Name="License.MYSQL" Source="..\License.MYSQL" DiskId="1"/>
         <RegistryKey Id="MySqlKey" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="Software\MySQL AB\MySQL Connector/Net">

=== added file 'LICENSE.mysql'
--- a/LICENSE.mysql	1970-01-01 00:00:00 +0000
+++ b/LICENSE.mysql	2010-12-01 17:53:47 +0000
@@ -0,0 +1,16 @@
+MySQL Connector/Net 6.x
+Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.
+If this software or related documentation is delivered to the U.S. Government or anyone licensing it on behalf of the U.S. Government, the following notice is applicable:
+U.S. GOVERNMENT RIGHTS Programs, software, databases, and related documentation and technical data delivered to U.S. Government customers are "commercial computer software" or "commercial technical data" pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, the use, duplication, disclosure, modification, and adaptation shall be subject to the restrictions and license terms set forth in the applicable Government contract, and, to the extent applicable by the terms of the Government contract, the additional rights set forth in FAR 52.227-19, Commercial Computer Software License (December 2007). Oracle USA, Inc., 500 Oracle Parkway, Redwood City, CA 94065.
+This software is developed for general use in a variety of information management applications. It is not developed or intended for use in any inherently dangerous applications, including applications which may create a risk of personal injury. If you use this software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure the safe use of this software. Oracle Corporation and its affiliates disclaim any liability for any damages caused by use of this software in dangerous applications.
+Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective owners.
+This software and documentation may provide access to or information on content, products, and services from third parties. Oracle Corporation and its affiliates are not responsible for and expressly disclaim all warranties of any kind with respect to third-party content, products, and services. Oracle Corporation and its affiliates will not be responsible for any loss, costs, or damages incurred due to your access to or use of third-party content, products, or services.
\ No newline at end of file

=== modified file 'package.proj'
--- a/package.proj	2010-08-30 20:17:30 +0000
+++ b/package.proj	2010-12-01 17:55:00 +0000
@@ -53,6 +53,7 @@
     <MakeDir Directories ="tmp"/>
     <Copy SourceFiles ="@(SourceFiles)" DestinationFolder="tmp/%(RecursiveDir)"/>
     <Delete Files="tmp/Readme-commercial" Condition=" '$(Configuration)' == 'GPL' "/>
+    <Delete Files="tmp/License.MYSQL" Condition=" '$(Configuration)' == 'GPL' "/>
     <Delete Files="tmp/Readme" Condition=" '$(Configuration)' == 'Commercial' "/>
     <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README" Condition=" '$(Configuration)' == 'Commercial' "/>
@@ -93,6 +94,7 @@
       <BinaryFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
       <BinaryFiles Include="README" Condition=" '$(Configuration)' == 'GPL' "/>
       <BinaryFiles Include="README-Commercial" Condition=" '$(Configuration)' == 'Commercial' "/>
+      <BinaryFiles Include="License.MYSQL" Condition=" '$(Configuration)' == 'Commercial' "/>
       <BinaryFiles Include="Release Notes.txt"/>
       <BinaryFiles Include="CHANGES"/>

Attachment: [text/bzr-bundle] bzr/
bzr commit into connector-net-trunk branch (reggie.burnett:947) Reggie Burnett1 Dec