From 356e6cf4b29b6cb290238081ac5393722025f166 Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Tue, 24 May 2011 14:34:28 +0000 Subject: [PATCH] Bug 346568 - Update licenses for Indigo --- .../org.eclipse.cdt.build.crossgcc-feature/feature.properties | 3 ++- cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml | 4 +++- cross/org.eclipse.cdt.build.crossgcc-feature/license.html | 3 ++- .../sourceTemplateFeature/feature.properties | 3 ++- .../sourceTemplateFeature/license.html | 3 ++- .../org.eclipse.cdt.launch.remote-feature/feature.properties | 3 ++- cross/org.eclipse.cdt.launch.remote-feature/feature.xml | 4 +++- cross/org.eclipse.cdt.launch.remote-feature/license.html | 3 ++- .../sourceTemplateFeature/feature.properties | 3 ++- .../sourceTemplateFeature/license.html | 3 ++- jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.properties | 3 ++- jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml | 4 +++- jtag/org.eclipse.cdt.debug.gdbjtag-feature/license.html | 3 ++- upc/org.eclipse.cdt.bupc-feature/feature.properties | 3 ++- upc/org.eclipse.cdt.bupc-feature/feature.xml | 4 +++- upc/org.eclipse.cdt.bupc-feature/license.html | 3 ++- windows/org.eclipse.cdt.msw-feature/feature.properties | 3 ++- windows/org.eclipse.cdt.msw-feature/feature.xml | 4 +++- windows/org.eclipse.cdt.msw-feature/license.html | 3 ++- 19 files changed, 43 insertions(+), 19 deletions(-) diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties index cf47252a2de..6774b8113f6 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties @@ -42,7 +42,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -111,6 +111,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml index f0670349e9f..643055903ab 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml @@ -4,7 +4,9 @@ label="%featureName" version="1.0.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.cdt.build.crossgcc"> + plugin="org.eclipse.cdt.build.crossgcc" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> %description diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/license.html b/cross/org.eclipse.cdt.build.crossgcc-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/license.html +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/license.html @@ -8,7 +8,7 @@

Eclipse Foundation Software User Agreement

-

April 14, 2010

+

February 1, 2011

Usage Of Content

@@ -58,6 +58,7 @@ that directory.

OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):