Index: /applications/editors/josm/plugins/merge-overlap/.classpath
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/.classpath	(revision 29644)
+++ /applications/editors/josm/plugins/merge-overlap/.classpath	(revision 29645)
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"/>
-	<classpathentry kind="lib" path="/usr/share/josm/josm.jar" sourcepath="/JOSM"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="bin"/>
Index: /applications/editors/josm/plugins/merge-overlap/.project
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/.project	(revision 29644)
+++ /applications/editors/josm/plugins/merge-overlap/.project	(revision 29645)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>merge-overlap</name>
+	<name>JOSM-merge-overlap</name>
 	<comment></comment>
 	<projects>
Index: /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs	(revision 29644)
+++ /applications/editors/josm/plugins/merge-overlap/.settings/org.eclipse.jdt.core.prefs	(revision 29645)
@@ -1,8 +1,7 @@
-#Thu Nov 05 21:57:09 CET 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
Index: /applications/editors/josm/plugins/merge-overlap/build.xml
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 29644)
+++ /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 29645)
@@ -1,31 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is the build file for the merge-overlap plugin.
-**
-** Maintaining versions
-** ====================
-** see README.template
-**
-** Usage
-** =====
-** To build it run
-**
-**    > ant  dist
-**
-** To install the generated plugin locally (in you default plugin directory) run
-**
-**    > ant  install
-**
-** The generated plugin jar is not automatically available in JOSMs plugin configuration
-** dialog. You have to check it in first.
-**
-** Use the ant target 'publish' to check in the plugin and make it available to other
-** JOSM users:
-**    set the properties commit.message and plugin.main.version
-** and run
-**    > ant  publish
-**
-**
--->
 <project name="merge-overlap" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
@@ -33,32 +5,14 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4980"/>
+    
+    <!-- Configure these properties (replace "..." accordingly).
+         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+    -->
+    <property name="plugin.author" value="Stéphane Brunner"/>
+    <property name="plugin.class" value="mergeoverlap.MergeOverlapPlugin"/>
+    <property name="plugin.description" value="Merge overlapping part of ways."/>
+    <property name="plugin.icon" value="images/merge_overlap.png"/>
 
+    <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.jar ... "/>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-	    <copy todir="${plugin.build.dir}">
-	        <fileset dir=".">
-	            <include name="README"/>
-	            <include name="LICENSE"/>
-	        </fileset>
-	    </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-            <manifest>
-                <attribute name="Author" value="Stéphane Brunner"/>
-                <attribute name="Plugin-Class" value="mergeoverlap.MergeOverlapPlugin"/>
-                <attribute name="Plugin-Description" value="Merge overlapping part of ways."/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Icon" value="images/merge_overlap.png"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-            </manifest>
-        </jar>
-    </target>
 </project>