swt-gtk: Do not install/stage swt-pi.jar and swt.jar any more.

6 files changed, 10 insertions, 8 deletions

diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 9c978950c8..56e77faefa 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -32,9 +32,7 @@ do_compile() {
 addtask unpackpost after do_unpack before do_patch
 
 do_install() {
-  oe_jarinstall swt-pi.jar
-  oe_jarinstall swt.jar
-  oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar
+  oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar swt.jar
 
   oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni}
   oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni}  
@@ -43,9 +41,7 @@ do_install() {
 }
 
 do_stage() {
-  oe_jarinstall -s swt-pi.jar
-  oe_jarinstall -s swt.jar
-  oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar
+  oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar swt.jar
 }
 
 PACKAGES += "lib${PN}-jni"
diff --git a/packages/swt/swt3.3-gtk_3.3.1.bb b/packages/swt/swt3.3-gtk_3.3.1.bb
index 5b17853725..82860edfb3 100644
--- a/packages/swt/swt3.3-gtk_3.3.1.bb
+++ b/packages/swt/swt3.3-gtk_3.3.1.bb
@@ -1,5 +1,7 @@
 require swt-gtk.inc
 
+PR = "r1"
+
 SRC_URI = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip \
            file://Makefile"
 
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
index d3dfe4d216..7033d0c854 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
@@ -1,6 +1,6 @@
 require swt3.4-gtk_${PV}.bb
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "libhildon libhildonfm"
 
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
index 17d85b46f3..9a74844f59 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
@@ -1,6 +1,6 @@
 require swt3.4-gtk_${PV}.bb
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libhildon libhildonfm"
 
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
index 701339d374..eda136b329 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
@@ -1,5 +1,7 @@
 require swt-gtk.inc
 
+PR = "r1"
+
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
            file://Makefile \
 	   file://make_linux-fix.patch;patch=1"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
index 4035d083f7..4cdd7c0f94 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
+++ b/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
@@ -1,5 +1,7 @@
 require swt-gtk.inc
 
+PR = "r1"
+
 SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \
            file://Makefile"