[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169

Jakub Adam jakub.adam at ktknet.cz
Sun May 27 14:53:16 UTC 2012


The following commit has been merged in the master-3.8 branch:
commit efb53c547ca82b692fdf0e827ae1cdb295bf38e2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat May 26 13:36:48 2012 +0200

    Refreshed jdt-junit4-fix.patch

diff --git a/debian/patches/jdt-junit4-fix.patch b/debian/patches/jdt-junit4-fix.patch
index 5c11633..3d080c7 100644
--- a/debian/patches/jdt-junit4-fix.patch
+++ b/debian/patches/jdt-junit4-fix.patch
@@ -48,10 +48,10 @@ index 3971e85..d0bc1e0 100644
 +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
 diff --git a/eclipse/features/org.eclipse.jdt/feature.xml b/eclipse/features/org.eclipse.jdt/feature.xml
-index 4a5fcd5..aa3bbd6 100644
+index 353e1f8..4998177 100644
 --- a/eclipse/features/org.eclipse.jdt/feature.xml
 +++ b/eclipse/features/org.eclipse.jdt/feature.xml
-@@ -160,7 +160,7 @@
+@@ -155,7 +155,7 @@
           id="org.junit"
           download-size="0"
           install-size="0"
@@ -61,12 +61,13 @@ index 4a5fcd5..aa3bbd6 100644
     <plugin
           id="org.junit"
 diff --git a/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF b/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF
-index 5739663..aaf4678 100644
+index a20fb01..b5113fe 100644
 --- a/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF
 +++ b/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF
-@@ -7,4 +7,4 @@ Bundle-Localization: plugin
+@@ -7,5 +7,5 @@ Bundle-Localization: plugin
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Bundle-Vendor: %providerName
  Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=reexport,
 - org.junit;bundle-version="4.8.1";visibility:=reexport
 + org.junit;bundle-version="4.7.0";visibility:=reexport
+ Eclipse-BundleShape: dir

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



More information about the pkg-java-commits mailing list