From 1d1c3e6c5a83754440cb66b16e8a18c46cc59ff0 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 12 Jun 2012 14:06:10 -0400
Subject: [PATCH] Remove technology reference as Linux Tools has been moved.

Conflicts:

	changelog/org.eclipse.linuxtools.changelog-feature/p2.inf
	gcov/org.eclipse.linuxtools.gcov-feature/p2.inf
	gprof/org.eclipse.linuxtools.gprof-feature/p2.inf
	libhover/org.eclipse.linuxtools.cdt.libhover-feature/p2.inf
	libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/p2.inf
	libhover/org.eclipse.linuxtools.cdt.libhover.newlib-feature/p2.inf
	lttng/org.eclipse.linuxtools.lttng/p2.inf
	lttng/org.eclipse.linuxtools.lttng2.kernel/p2.inf
	lttng/org.eclipse.linuxtools.lttng2/p2.inf
	lttng/org.eclipse.linuxtools.tmf/p2.inf
	man/org.eclipse.linuxtools.man-feature/p2.inf
	oprofile/org.eclipse.linuxtools.oprofile-feature/p2.inf
	perf/org.eclipse.linuxtools.perf-feature/p2.inf
	profiling/org.eclipse.linuxtools.dataviewers-feature/p2.inf
	profiling/org.eclipse.linuxtools.profiling-feature/p2.inf
	profiling/org.eclipse.linuxtools.profiling.remote-feature/p2.inf
	profiling/org.eclipse.linuxtools.tools.launch-feature/p2.inf
	releng/org.eclipse.linuxtools.releng-site/pom.xml
	releng/org.eclipse.linuxtools.releng-site/promoter.xml
	rpm/org.eclipse.linuxtools.rpm-feature/p2.inf
	rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/p2.inf
	systemtap/org.eclipse.linuxtools.callgraph-feature/p2.inf
	systemtap/org.eclipse.linuxtools.systemtap-feature/p2.inf
	systemtap/org.eclipse.linuxtools.systemtap.backup-feature/p2.inf
	systemtap/org.eclipse.linuxtools.threadprofiler.feature/p2.inf
	valgrind/org.eclipse.linuxtools.valgrind-feature/p2.inf
	valgrind/org.eclipse.linuxtools.valgrind.remote-feature/p2.inf
---
 org.eclipse.linuxtools.ctf/feature.xml                | 2 +-
 org.eclipse.linuxtools.lttng.releng-site/category.xml | 4 ++--
 org.eclipse.linuxtools.lttng/feature.xml              | 2 +-
 org.eclipse.linuxtools.lttng/p2.inf                   | 4 ++--
 org.eclipse.linuxtools.lttng2.kernel/feature.xml      | 2 +-
 org.eclipse.linuxtools.lttng2.kernel/p2.inf           | 4 ++--
 org.eclipse.linuxtools.lttng2/feature.xml             | 2 +-
 org.eclipse.linuxtools.lttng2/p2.inf                  | 4 ++--
 org.eclipse.linuxtools.tmf/feature.xml                | 2 +-
 org.eclipse.linuxtools.tmf/p2.inf                     | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/org.eclipse.linuxtools.ctf/feature.xml b/org.eclipse.linuxtools.ctf/feature.xml
index 2d342bdc84..db406d00f2 100644
--- a/org.eclipse.linuxtools.ctf/feature.xml
+++ b/org.eclipse.linuxtools.ctf/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
    </url>
 
    <requires>
diff --git a/org.eclipse.linuxtools.lttng.releng-site/category.xml b/org.eclipse.linuxtools.lttng.releng-site/category.xml
index c374fe96e6..406bcc6666 100644
--- a/org.eclipse.linuxtools.lttng.releng-site/category.xml
+++ b/org.eclipse.linuxtools.lttng.releng-site/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site
-      mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/updates-nightly/site.xml&amp;format=xml">
-   <description url="http://download.eclipse.org/technology/linuxtools/updates-nightly">
+      mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/linuxtools/updates-nightly-juno/site.xml&amp;format=xml">
+   <description url="http://download.eclipse.org/linuxtools/updates-nightly-juno">
       Nightly builds of Linux Tools project.
    </description>
    <feature url="features/org.eclipse.linuxtools.lttng_1.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="1.0.0.qualifier" os="linux" ws="*" arch="*">
diff --git a/org.eclipse.linuxtools.lttng/feature.xml b/org.eclipse.linuxtools.lttng/feature.xml
index 3e0bbb266b..12dbb7c9c7 100644
--- a/org.eclipse.linuxtools.lttng/feature.xml
+++ b/org.eclipse.linuxtools.lttng/feature.xml
@@ -22,7 +22,7 @@
    </license>
 
    <url>
-      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
    </url>
 
    <includes
diff --git a/org.eclipse.linuxtools.lttng/p2.inf b/org.eclipse.linuxtools.lttng/p2.inf
index 030d966679..5246a0c824 100644
--- a/org.eclipse.linuxtools.lttng/p2.inf
+++ b/org.eclipse.linuxtools.lttng/p2.inf
@@ -1,3 +1,3 @@
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
diff --git a/org.eclipse.linuxtools.lttng2.kernel/feature.xml b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
index fa515c1b2e..0ed758abed 100644
--- a/org.eclipse.linuxtools.lttng2.kernel/feature.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
    </url>
 
    <includes
diff --git a/org.eclipse.linuxtools.lttng2.kernel/p2.inf b/org.eclipse.linuxtools.lttng2.kernel/p2.inf
index 030d966679..5246a0c824 100644
--- a/org.eclipse.linuxtools.lttng2.kernel/p2.inf
+++ b/org.eclipse.linuxtools.lttng2.kernel/p2.inf
@@ -1,3 +1,3 @@
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
diff --git a/org.eclipse.linuxtools.lttng2/feature.xml b/org.eclipse.linuxtools.lttng2/feature.xml
index 31d6f098c0..746b4218a7 100644
--- a/org.eclipse.linuxtools.lttng2/feature.xml
+++ b/org.eclipse.linuxtools.lttng2/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
    </url>
 
    <includes
diff --git a/org.eclipse.linuxtools.lttng2/p2.inf b/org.eclipse.linuxtools.lttng2/p2.inf
index 030d966679..5246a0c824 100644
--- a/org.eclipse.linuxtools.lttng2/p2.inf
+++ b/org.eclipse.linuxtools.lttng2/p2.inf
@@ -1,3 +1,3 @@
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
diff --git a/org.eclipse.linuxtools.tmf/feature.xml b/org.eclipse.linuxtools.tmf/feature.xml
index 285cdff9e2..328eb6e2d4 100644
--- a/org.eclipse.linuxtools.tmf/feature.xml
+++ b/org.eclipse.linuxtools.tmf/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Linux Tools Update Site" url="http://download.eclipse.org/technology/linuxtools/update"/>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
    </url>
 
    <includes
diff --git a/org.eclipse.linuxtools.tmf/p2.inf b/org.eclipse.linuxtools.tmf/p2.inf
index 030d966679..5246a0c824 100644
--- a/org.eclipse.linuxtools.tmf/p2.inf
+++ b/org.eclipse.linuxtools.tmf/p2.inf
@@ -1,3 +1,3 @@
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/technology/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
-- 
2.34.1