From e9340257aaf6cac6e1e6202890d3776c7dcf8c3f Mon Sep 17 00:00:00 2001
From: gwatson <g.watson@computer.org>
Date: Thu, 26 Jun 2014 14:41:30 -0400
Subject: [PATCH] Merge from M1_0_maintenance

Change-Id: I357dedf01c2621de6617cd50d3671046b627f3d5
Signed-off-by: gwatson <g.watson@computer.org>
---
 releng/org.eclipse.remote.build/update_versions | 6 +++---
 releng/org.eclipse.remote.repo/category.xml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releng/org.eclipse.remote.build/update_versions b/releng/org.eclipse.remote.build/update_versions
index b4a72b20eeb..32cf53e3c7c 100644
--- a/releng/org.eclipse.remote.build/update_versions
+++ b/releng/org.eclipse.remote.build/update_versions
@@ -32,7 +32,7 @@ if [ $# -gt 2 ]; then
 	BRANCH=$3
 fi
 
-if [ -f fix_versions ]; then
+if [ -d fix_versions ]; then
 	echo "please remove fix_versions first"
 	exit 1
 fi
@@ -53,12 +53,12 @@ update_manifest() {
 	mv $1/META-INF/MANIFEST.MF.tmp $1/META-INF/MANIFEST.MF
 }
 
-for feature in org.eclipse.remote/*-feature; do
+for feature in org.eclipse.remote/features/*-feature; do
 	echo "Updating $feature..."
 	update_feature $feature $version
 done
 
-(cd org.eclipse.remote && \
+(cd org.eclipse.remote/releng/org.eclipse.remote.build && \
 	mvn versions:set -DnewVersion="${version}-SNAPSHOT" && \
 	mvn org.eclipse.tycho:tycho-versions-plugin:0.14.0:update-pom)
 
diff --git a/releng/org.eclipse.remote.repo/category.xml b/releng/org.eclipse.remote.repo/category.xml
index 5be5984c165..4fe8f479a4e 100644
--- a/releng/org.eclipse.remote.repo/category.xml
+++ b/releng/org.eclipse.remote.repo/category.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.remote_1.0.0.qualifier.jar" id="org.eclipse.remote" version="1.0.0.qualifier"/>
+   <feature url="features/org.eclipse.remote_0.0.0.qualifier.jar" id="org.eclipse.remote" version="0.0.0"/>
 </site>