[oe-commits] org.oe.dev swt-gtk: Do not install/stage swt-pi.jar and swt.jar any more.

[thebohemian commit]

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

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 7845f20bb970124a1ca02e777d622c6f8e4cc0e0
ViewMTN: http://monotone.openembedded.org/revision/info/7845f20bb970124a1ca02e777d622c6f8e4cc0e0
Files:
1
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M5.bb
Diffs:

#
# mt diff -rae71623a2c722c78935fc0461cdcaab87317ba3b -r7845f20bb970124a1ca02e777d622c6f8e4cc0e0
#
#
#
# patch "packages/swt/swt-gtk.inc"
#  from [63792d964f1f171ba6f802dc502978513888f9d1]
#    to [34ce8d11fb9f91b158bc4c9b563ee476e7e9af97]
# 
# patch "packages/swt/swt3.3-gtk_3.3.1.bb"
#  from [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
#    to [1316c4c5234703233997ae43f461c3dbf00edc9f]
# 
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
#  from [8dd921847bcbe0395c0edf0aefecd834ec3d7191]
#    to [8afa34d71a75484e91ee61f5b889b645a0435a57]
# 
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb"
#  from [3916433c0bdcdb906ba537ccf470b67f134ff0bf]
#    to [569de3e1f4555130a36384e36cc7aa658d2aef9d]
# 
# patch "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
#  from [a779adf603545ff091c4414cb8912b456679c9f6]
#    to [73232c0b9e0b3ec716fdf920c4be653dcb7fd613]
# 
# patch "packages/swt/swt3.4-gtk_3.3+3.4M5.bb"
#  from [49299001965c29d520d50104199531c9d47f72dc]
#    to [0cbecf9ad22346931fc40901ade6bee845011827]
#
============================================================
--- packages/swt/swt-gtk.inc	63792d964f1f171ba6f802dc502978513888f9d1
+++ packages/swt/swt-gtk.inc	34ce8d11fb9f91b158bc4c9b563ee476e7e9af97
@@ -32,9 +32,7 @@ do_install() {
 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_stage() {
 }
 
 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"
============================================================
--- packages/swt/swt3.3-gtk_3.3.1.bb	ac1e6656f8358a0ce3928cd18fcdc21d2d36511e
+++ packages/swt/swt3.3-gtk_3.3.1.bb	1316c4c5234703233997ae43f461c3dbf00edc9f
@@ -1,5 +1,7 @@ require swt-gtk.inc
 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"
 
============================================================
--- packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb	8dd921847bcbe0395c0edf0aefecd834ec3d7191
+++ packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb	8afa34d71a75484e91ee61f5b889b645a0435a57
@@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb
 require swt3.4-gtk_${PV}.bb
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "libhildon libhildonfm"
 
============================================================
--- packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb	3916433c0bdcdb906ba537ccf470b67f134ff0bf
+++ packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb	569de3e1f4555130a36384e36cc7aa658d2aef9d
@@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb
 require swt3.4-gtk_${PV}.bb
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libhildon libhildonfm"
 
============================================================
--- packages/swt/swt3.4-gtk_3.3+3.4M3.bb	a779adf603545ff091c4414cb8912b456679c9f6
+++ packages/swt/swt3.4-gtk_3.3+3.4M3.bb	73232c0b9e0b3ec716fdf920c4be653dcb7fd613
@@ -1,5 +1,7 @@ require swt-gtk.inc
 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"
============================================================
--- packages/swt/swt3.4-gtk_3.3+3.4M5.bb	49299001965c29d520d50104199531c9d47f72dc
+++ packages/swt/swt3.4-gtk_3.3+3.4M5.bb	0cbecf9ad22346931fc40901ade6bee845011827
@@ -1,5 +1,7 @@ require swt-gtk.inc
 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"