[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.8.0_rc3-2-9-g1f5249e

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit 96c67e80b024de74971bce61d7b4a06c89eafbae
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 16 15:57:46 2012 +0200

    Ensure both junit and junit4 are found by JDT

diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index ed575d4..7343423 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -19,4 +19,4 @@ usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.hamcrest.core_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.junit4_*
-usr/lib/eclipse/dropins/jdt/plugins/org.junit_*\.v*
+usr/lib/eclipse/dropins/jdt/plugins/org.junit_*.dist
diff --git a/debian/patches/jdt-junit4-fix.patch b/debian/patches/jdt-junit4-fix.patch
index 3d080c7..2de407c 100644
--- a/debian/patches/jdt-junit4-fix.patch
+++ b/debian/patches/jdt-junit4-fix.patch
@@ -3,17 +3,17 @@ Date: Fri, 23 Mar 2012 18:47:21 +0100
 Subject: jdt-junit4-fix
 
 ---
- build.xml                                       |   17 -----------------
- dependencies/jdtnonosgidependencies.properties  |    5 +++--
+ build.xml                                       |   20 --------------------
+ dependencies/jdtnonosgidependencies.properties  |    7 +++++--
  eclipse/features/org.eclipse.jdt/feature.xml    |    2 +-
  eclipse/plugins/org.junit4/META-INF/MANIFEST.MF |    2 +-
- 4 files changed, 5 insertions(+), 21 deletions(-)
+ 4 files changed, 7 insertions(+), 24 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index f0b78ad..f99abfa 100644
+index 578b1e8..a12fbea 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -419,23 +419,6 @@
+@@ -419,26 +419,6 @@
  			<regexp pattern="^SHA1-Digest.*" />
  			<substitution expression="" />
  		</replaceregexp>
@@ -34,21 +34,26 @@ index f0b78ad..f99abfa 100644
 -			<fileset dir="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/"/>
 -			<zipfileset src="/usr/share/java/junit.jar"/>
 -		</jar>
+-
+-		<delete dir="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/"/>
+-		<delete dir="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/"/>
  
- 		<delete dir="${buildDirectory}/plugins/org.junit_4.8.2.v4_8_2_v20110321-1705/"/>
- 		<delete dir="${buildDirectory}/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/"/>
+ 		<!-- Create a stamp file -->
+ 		<echo file="symlinks-stamp" />
 diff --git a/dependencies/jdtnonosgidependencies.properties b/dependencies/jdtnonosgidependencies.properties
-index 3971e85..d0bc1e0 100644
+index 3971e85..350712d 100644
 --- a/dependencies/jdtnonosgidependencies.properties
 +++ b/dependencies/jdtnonosgidependencies.properties
-@@ -1,2 +1,3 @@
+@@ -1,2 +1,5 @@
 -org.junit4/junit.jar=/usr/share/java/junit.jar
 -org.junit_4.8.2.v4_8_2_v20110321-1705.jar=/usr/share/java/junit.jar
 +org.junit4/junit.jar=/usr/share/java/junit4.jar
-+org.junit_4.8.2.v4_8_2_v20110321-1705.jar=/usr/share/java/junit4.jar
-+org.junit_3.8.2.v3_8_2_v20100427-1100.jar=/usr/share/java/junit.jar
++org.junit_4.8.2.v4_8_2_v20110321-1705/junit.jar=/usr/share/java/junit4.jar
++org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit.jar
++org.junit_4.8.2.dist/junit.jar=/usr/share/java/junit4.jar
++org.junit_3.8.2.dist/junit.jar=/usr/share/java/junit.jar
 diff --git a/eclipse/features/org.eclipse.jdt/feature.xml b/eclipse/features/org.eclipse.jdt/feature.xml
-index 353e1f8..4998177 100644
+index 353e1f8..584d808 100644
 --- a/eclipse/features/org.eclipse.jdt/feature.xml
 +++ b/eclipse/features/org.eclipse.jdt/feature.xml
 @@ -155,7 +155,7 @@
@@ -56,7 +61,7 @@ index 353e1f8..4998177 100644
           download-size="0"
           install-size="0"
 -         version="4.10.0.qualifier"/>
-+         version="4.7.0"/>
++         version="4.8.2.qualifier"/>
  
     <plugin
           id="org.junit"

-- 
eclipse - Powerful IDE written in java - Debian package.