propagate from branch 'org.openembedded.dev' (head a09cb27506f56d7b4d048f4d60c7df2e11968692)

            to branch 'org.openembedded.nslu2-linux' (head 145ec84e58e7acefd29711cc2431b9809b8804e9)

47 files changed, 428 insertions, 790 deletions

diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
new file mode 100644
index 0000000000..260541c39f
--- /dev/null
+++ b/packages/cairo/cairo_0.5.2.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+# DEPENDS = "x11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "x11 libpixman libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 562f67114a..e298b1caa1 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -3,7 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r1"
+PR = "r2"
+include gcc_${PV}.bb
+
+# Files for these are defined in the main gcc.oe
+#PACKAGES = "libgcc libstdc++ libg2c"
 
 inherit autotools sdk
 
@@ -75,6 +79,39 @@ do_compile () {
 	oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" 
 }
 
-do_install () {
-	autotools_do_install
+#do_install () {
+#	autotools_do_install
+#}
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+        bb.build.exec_func('package_do_package', d)
 }
+
+do_install () {
+        oe_runmake 'DESTDIR=${D}' install
+
+        # Move libgcc_s into /lib
+        mkdir -p ${D}${base_libdir}
+        if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
+                # native builds drop one pathname component
+                mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
+        else
+                mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
+        fi
+
+        # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+        TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
+        mkdir -p ${D}${TGT_LIBDIR}
+        mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+        mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
+
+        # Manually run the target stripper since we won't get it run by
+        # the packaging.
+        if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+                ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+                ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+                ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
+        fi
+}
\ No newline at end of file
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index 71ff770f52..a403fae24c 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -4,10 +4,11 @@ DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 PROVIDES = "gconf"
-RPROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "0.0cvs${CVSDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
new file mode 100644
index 0000000000..cc623451ef
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -0,0 +1,32 @@
+inherit autotools pkgconfig
+
+PR = "r0"
+PV = "2.10pre3+cvs-${CVSDATE}"
+DEFAULT_PREFERENCE="-1"
+
+PACKAGES += "gpsdrive-add"
+DESCRIPTION = "GPS navigation/map display software"
+DEPENDS = "virtual/libc gtk+ pcre gpsd"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \
+           file://gpsdrive.desktop"
+
+S = "${WORKDIR}/gpsdrive"
+CFLAGS += "-D_GNU_SOURCE"
+
+FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += "${datadir}/${PN}"
+
+FILES_gpsdrive-add = "${libdir}"
+ 
+EXTRA_OECONF = "--disable-garmin"
+
+do_install_append () {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
+}
diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index 5b576ecc93..85a194b850 100644..100755
--- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@ -108,11 +108,13 @@ keycode 88 = F11
 keycode 97 = Control  
 keycode 99 = F12       
 keycode 103 = Up              
+	altgr     keycode 103 = PageUp
 keycode 105 = Left            
 	altgr     keycode 105 = Decr_Console
 keycode 106 = Right           
 	altgr     keycode 106 = Incr_Console
 keycode 108 = Down  
+	altgr     keycode 108 = PageDown
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
@@ -141,71 +143,71 @@ string Prior = "\033[5~"
 string Next = "\033[6~"
 string Macro = "\033[M"
 string Pause = "\033[P"
-compose '`' 'A' to 'À'
-compose '`' 'a' to 'à'
-compose '\'' 'A' to 'Á'
-compose '\'' 'a' to 'á'
-compose '^' 'A' to 'Â'
-compose '^' 'a' to 'â'
-compose '~' 'A' to 'Ã'
-compose '~' 'a' to 'ã'
-compose '"' 'A' to 'Ä'
-compose '"' 'a' to 'ä'
-compose 'O' 'A' to 'Å'
-compose 'o' 'a' to 'å'
-compose '0' 'A' to 'Å'
-compose '0' 'a' to 'å'
-compose 'A' 'A' to 'Å'
-compose 'a' 'a' to 'å'
-compose 'A' 'E' to 'Æ'
-compose 'a' 'e' to 'æ'
-compose ',' 'C' to 'Ç'
-compose ',' 'c' to 'ç'
-compose '`' 'E' to 'È'
-compose '`' 'e' to 'è'
-compose '\'' 'E' to 'É'
-compose '\'' 'e' to 'é'
-compose '^' 'E' to 'Ê'
-compose '^' 'e' to 'ê'
-compose '"' 'E' to 'Ë'
-compose '"' 'e' to 'ë'
-compose '`' 'I' to 'Ì'
-compose '`' 'i' to 'ì'
-compose '\'' 'I' to 'Í'
-compose '\'' 'i' to 'í'
-compose '^' 'I' to 'Î'
-compose '^' 'i' to 'î'
-compose '"' 'I' to 'Ï'
-compose '"' 'i' to 'ï'
-compose '-' 'D' to 'Ð'
-compose '-' 'd' to 'ð'
-compose '~' 'N' to 'Ñ'
-compose '~' 'n' to 'ñ'
-compose '`' 'O' to 'Ò'
-compose '`' 'o' to 'ò'
-compose '\'' 'O' to 'Ó'
-compose '\'' 'o' to 'ó'
-compose '^' 'O' to 'Ô'
-compose '^' 'o' to 'ô'
-compose '~' 'O' to 'Õ'
-compose '~' 'o' to 'õ'
-compose '"' 'O' to 'Ö'
-compose '"' 'o' to 'ö'
-compose '/' 'O' to 'Ø'
-compose '/' 'o' to 'ø'
-compose '`' 'U' to 'Ù'
-compose '`' 'u' to 'ù'
-compose '\'' 'U' to 'Ú'
-compose '\'' 'u' to 'ú'
-compose '^' 'U' to 'Û'
-compose '^' 'u' to 'û'
-compose '"' 'U' to 'Ü'
-compose '"' 'u' to 'ü'
-compose '\'' 'Y' to 'Ý'
-compose '\'' 'y' to 'ý'
-compose 'T' 'H' to 'Þ'
-compose 't' 'h' to 'þ'
-compose 's' 's' to 'ß'
-compose '"' 'y' to 'ÿ'
-compose 's' 'z' to 'ß'
-compose 'i' 'j' to 'ÿ'
+compose '`' 'A' to '�
+compose '`' 'a' to '�
+compose '\'' 'A' to '�
+compose '\'' 'a' to '�
+compose '^' 'A' to '�
+compose '^' 'a' to '�
+compose '~' 'A' to '�
+compose '~' 'a' to '�
+compose '"' 'A' to '�
+compose '"' 'a' to '�
+compose 'O' 'A' to '�
+compose 'o' 'a' to '�
+compose '0' 'A' to '�
+compose '0' 'a' to '�
+compose 'A' 'A' to '�
+compose 'a' 'a' to '�
+compose 'A' 'E' to '�
+compose 'a' 'e' to '�
+compose ',' 'C' to '�
+compose ',' 'c' to '�
+compose '`' 'E' to '�
+compose '`' 'e' to '�
+compose '\'' 'E' to '�
+compose '\'' 'e' to '�
+compose '^' 'E' to '�
+compose '^' 'e' to '�
+compose '"' 'E' to '�
+compose '"' 'e' to '�
+compose '`' 'I' to '�
+compose '`' 'i' to '�
+compose '\'' 'I' to '�
+compose '\'' 'i' to '�
+compose '^' 'I' to '�
+compose '^' 'i' to '�
+compose '"' 'I' to '�
+compose '"' 'i' to '�
+compose '-' 'D' to '�
+compose '-' 'd' to '�
+compose '~' 'N' to '�
+compose '~' 'n' to '�
+compose '`' 'O' to '�
+compose '`' 'o' to '�
+compose '\'' 'O' to '�
+compose '\'' 'o' to '�
+compose '^' 'O' to '�
+compose '^' 'o' to '�
+compose '~' 'O' to '�
+compose '~' 'o' to '�
+compose '"' 'O' to '�
+compose '"' 'o' to '�
+compose '/' 'O' to '�
+compose '/' 'o' to ''
+compose '`' 'U' to '�
+compose '`' 'u' to ''
+compose '\'' 'U' to '�
+compose '\'' 'u' to ''
+compose '^' 'U' to '�
+compose '^' 'u' to ''
+compose '"' 'U' to '�
+compose '"' 'u' to ''
+compose '\'' 'Y' to '�
+compose '\'' 'y' to ''
+compose 'T' 'H' to '�
+compose 't' 'h' to ''
+compose 's' 's' to '�
+compose '"' 'y' to ''
+compose 's' 'z' to '�
+compose 'i' 'j' to ''
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..792a31d6da 100644..100755
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/initscripts/initscripts-1.0/keymap
diff --git a/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
new file mode 100644
index 0000000000..4a6bca982d
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/tosa/keymap-2.4.map
@@ -0,0 +1,131 @@
+keymaps 0-1,4-5
+alt_is_meta
+keycode   1 = a               
+keycode   2 = b               
+keycode   3 = c               
+keycode   4 = d               
+keycode   5 = e               
+keycode   6 = f               
+keycode   7 = g               
+keycode   8 = h               
+keycode   9 = i               
+keycode  10 = j               
+keycode  11 = k               
+keycode  12 = l               
+keycode  13 = m               
+keycode  14 = n               
+keycode  15 = o               
+keycode  16 = p               
+keycode  17 = q               
+keycode  18 = r               
+keycode  19 = s               
+keycode  20 = t               
+keycode  21 = u               
+keycode  22 = v               
+keycode  23 = w               
+keycode  24 = x               
+keycode  25 = y               
+keycode  26 = z               
+keycode  27 = Shift           
+keycode  28 = Return          
+keycode  29 = F11              
+keycode  30 = AltGr
+keycode  31 = BackSpace       
+keycode  32 = bar             
+keycode  33 = F15 
+keycode  34 = Escape          
+keycode  35 = Left            
+keycode  36 = Up              
+keycode  37 = Down            
+keycode  38 = Right           
+keycode  39 = Return          
+keycode  40 = F12
+keycode  41 = one             
+keycode  42 = two             
+keycode  43 = three           
+keycode  44 = four            
+keycode  45 = five            
+keycode  46 = six             
+keycode  47 = seven           
+keycode  48 = eight           
+keycode  49 = nine            
+keycode  50 = zero            
+keycode  51 = +adiaeresis      
+keycode  52 = +udiaeresis      
+keycode  53 = +odiaeresis      
+keycode  54 = +Adiaeresis      
+keycode  55 = +Udiaeresis      
+keycode  56 = +Odiaeresis      
+keycode  57 = +ssharp          
+keycode  58 = minus           
+keycode  59 = plus            
+keycode  60 = Shift_Lock      
+keycode  61 = at              
+keycode  62 = question        
+keycode  63 = comma           
+keycode  64 = period          
+keycode  65 = Tab             
+keycode  66 = F5              
+keycode  67 = F6              
+keycode  68 = F7              
+keycode  69 = slash           
+keycode  70 = apostrophe      
+keycode  71 = semicolon       
+keycode  72 = quotedbl        
+keycode  73 = colon           
+keycode  74 = numbersign      
+keycode  75 = dollar          
+keycode  76 = percent         
+keycode  77 = underscore      
+keycode  78 = ampersand       
+keycode  79 = asterisk        
+keycode  80 = parenleft       
+keycode  81 = Delete          
+keycode  82 = F10             
+keycode  83 = equal           
+keycode  84 = parenright      
+keycode  85 = asciitilde      
+keycode  86 = less            
+keycode  87 = greater         
+keycode  88 = F9              
+keycode  89 = F10             
+keycode  90 = F13             
+keycode  91 = space           
+	control	keycode  91 = nul             
+keycode  92 = space           
+	control	keycode  92 = nul             
+keycode  93 =
+keycode  94 = exclam          
+keycode  95 =
+keycode  96 =
+keycode  97 =
+keycode  98 =
+keycode  99 =
+keycode 100 =
+keycode 101 =
+keycode 102 =
+keycode 103 = Shift           
+keycode 104 = Control         
+keycode 105 = Control         
+keycode 106 = Alt             
+keycode 107 = Alt             
+keycode 108 = AltGr           
+keycode 109 =
+keycode 110 =
+keycode 111 =
+keycode 112 =
+keycode 113 =
+keycode 114 =
+keycode 115 =
+keycode 116 =
+keycode 117 =
+keycode 118 =
+keycode 119 =
+keycode 120 = F24
+keycode 121 =
+keycode 122 =
+keycode 123 =
+keycode 124 =
+keycode 125 =
+keycode 126 =
+keycode 127 =
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 3fbbda4cf8..76755e1744 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r48"
+PR = "r51"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,15 +30,16 @@ SRC_URI = "file://halt \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
-	   file://populate-volatile.sh \
-	   file://volatiles \
-           file://corgikeymap-2.6.map \
-           file://tosakeymap-2.6.map"
+           file://populate-volatile.sh \
+           file://volatiles \
+           file://keymap"
 
-SRC_URI_append_arm = " file://alignment.sh"
-SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_c7x0 =    " file://keymap"
-SRC_URI_append_tosa =    " file://keymap"
+SRC_URI_append_arm          = " file://alignment.sh"
+SRC_URI_append_openzaurus   = " file://checkversion"
+SRC_URI_append_c7x0         = " file://keymap-*.map"
+SRC_URI_append_tosa         = " file://keymap-*.map"
+SRC_URI_append_akita        = " file://keymap-*.map"
+SRC_URI_append_spitz        = " file://keymap-*.map"
 
 def read_kernel_version(d):
 	import bb
@@ -95,21 +96,19 @@ do_install () {
 
 	if [ "${DISTRO}" == "openzaurus" ]; then
 		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
-        	chmod 0755 				${D}${sysconfdir}/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
+		chmod 0755	${D}${sysconfdir}/init.d/checkversion
+		ln -sf		../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
 	fi
 
-	if [ "${MACHINE}" == "c7x0" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S00keymap
-	fi
-
-	if [ "${MACHINE}" == "tosa" ]; then
-		install -m 0755    ${WORKDIR}/tosakeymap-2.6.map		${D}${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S00keymap
-	fi
+    case ${MACHINE} in
+        c7x0 | tosa | spitz | akita )
+			install -m 0755 ${WORKDIR}/keymap		${D}${sysconfdir}/init.d
+			ln -sf	../init.d/keymap	${D}${sysconfdir}/rcS.d/S00keymap
+			install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
+			;;
+        *)
+			;;
+    esac
 
 	install -m 0755 ${WORKDIR}/banner	${D}${sysconfdir}/init.d/banner
 	install -m 0755 ${WORKDIR}/devices	${D}${sysconfdir}/init.d/devices
@@ -150,5 +149,5 @@ do_install () {
 		ln -sf	../init.d/alignment.sh	${D}${sysconfdir}/rcS.d/S06alignment
 	fi
 
-	install -m 0755    ${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
+	install -m 0755		${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
 }
diff --git a/packages/libusb/libusb-0.1.10a/ARMfix.patch b/packages/libusb/libusb-0.1.10a/ARMfix.patch
new file mode 100644
index 0000000000..803bd99bab
--- /dev/null
+++ b/packages/libusb/libusb-0.1.10a/ARMfix.patch
@@ -0,0 +1,20 @@
+--- /tmp/usb.c	2005-07-22 01:45:43.606167000 +0200
++++ libusb-0.1.10a/usb.c	2005-07-22 01:47:22.527128728 +0200
+@@ -156,7 +156,7 @@
+        * Some ports fetch the descriptors on scanning (like Linux) so we don't
+        * need to fetch them again.
+        */
+-      if (!dev->config) {
++/*     if (!dev->config) { */
+         usb_dev_handle *udev;
+ 
+         udev = usb_open(dev);
+@@ -165,7 +165,7 @@
+ 
+           usb_close(udev);
+         }
+-      }
++/*      }*/
+ 
+       changes++;
+ 
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 757c72ecb3..962572d546 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,6 +1,7 @@
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
+DEPENDS += "libidl libsvg-cairo"
 
 PACKAGES = ""
 
@@ -19,7 +20,7 @@ compositeext-dev \
 damageext-dev \
 dbus-dev \
 fixesext-dev \
-gconf-dev \
+gconf-dbus-dev \
 gtk+-dev \
 gtk-engines-dev \
 libapm-dev \
@@ -86,17 +87,15 @@ libxtst-dev \
 libz-dev \
 matchbox-desktop-dev \
 ncurses-dev \
-orbit2-dev \
 pango-dev \
 randrext-dev \
 recordext-dev \
 renderext-dev \
 resourceext-dev \
-rxvt-unicode-dev \
-wireless-tools-dev \
+libiw-dev \
 xcalibrateext-dev \
 xextensions-dev \
-xmu-dev \
+libxmu-dev \
 xproto-dev \
 xtrans-dev \
 "
@@ -148,7 +147,7 @@ EOF
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${libdir}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
 	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
 	# remove unwanted executables
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 63532c62b7..2272c182a7 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -6,7 +6,7 @@ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${
 FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
 
 LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
 
 include opie-collections.inc
 
diff --git a/packages/mozilla/firefox-0.9.2/.mtn2git_empty b/packages/mozilla/firefox-0.9.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-0.9.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-0.9.2/mozconfig b/packages/mozilla/firefox-0.9.2/mozconfig
deleted file mode 100644
index 2546be9ecf..0000000000
--- a/packages/mozilla/firefox-0.9.2/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-#ac_add_options --disable-profilesharing
-#ac_add_options --disable-profilelocking
-#ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-0.9.3/.mtn2git_empty b/packages/mozilla/firefox-0.9.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-0.9.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-0.9.3/mozconfig b/packages/mozilla/firefox-0.9.3/mozconfig
deleted file mode 100644
index f52a7a7e83..0000000000
--- a/packages/mozilla/firefox-0.9.3/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-0.9/.mtn2git_empty b/packages/mozilla/firefox-0.9/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-0.9/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-0.9/mozconfig b/packages/mozilla/firefox-0.9/mozconfig
deleted file mode 100644
index 2546be9ecf..0000000000
--- a/packages/mozilla/firefox-0.9/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-#ac_add_options --disable-profilesharing
-#ac_add_options --disable-profilelocking
-#ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-1.0.3/.mtn2git_empty b/packages/mozilla/firefox-1.0.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.0.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-1.0.3/mozconfig b/packages/mozilla/firefox-1.0.3/mozconfig
deleted file mode 100644
index 025b396ac7..0000000000
--- a/packages/mozilla/firefox-1.0.3/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-1.0.4/.mtn2git_empty b/packages/mozilla/firefox-1.0.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.0.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-1.0.4/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0.4/firefox-cc-fix.patch
deleted file mode 100644
index e2df2a390c..0000000000
--- a/packages/mozilla/firefox-1.0.4/firefox-cc-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/js/src/Makefile.in	2004-03-31 09:38:54.000000000 -0700
-+++ mozilla.new/js/src/Makefile.in	2004-11-12 16:29:32.856436952 -0700
-@@ -342,16 +342,10 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
-+# OE hack - we copy this in 
- jsautocfg.h:
- 	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--
-+	
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
- # the mdcpucfg for the target so it needs the appropriate target defines
diff --git a/packages/mozilla/firefox-1.0.4/jsautocfg.h b/packages/mozilla/firefox-1.0.4/jsautocfg.h
deleted file mode 100644
index 05f3dad50a..0000000000
--- a/packages/mozilla/firefox-1.0.4/jsautocfg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* Lovingly crafted by hand avoiding Mozilla stupidity */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  2L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/firefox-1.0.4/mozconfig b/packages/mozilla/firefox-1.0.4/mozconfig
deleted file mode 100644
index 025b396ac7..0000000000
--- a/packages/mozilla/firefox-1.0.4/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-1.0.5/.mtn2git_empty b/packages/mozilla/firefox-1.0.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.0.5/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-1.0.5/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0.5/firefox-cc-fix.patch
deleted file mode 100644
index e2df2a390c..0000000000
--- a/packages/mozilla/firefox-1.0.5/firefox-cc-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/js/src/Makefile.in	2004-03-31 09:38:54.000000000 -0700
-+++ mozilla.new/js/src/Makefile.in	2004-11-12 16:29:32.856436952 -0700
-@@ -342,16 +342,10 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
-+# OE hack - we copy this in 
- jsautocfg.h:
- 	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--
-+	
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
- # the mdcpucfg for the target so it needs the appropriate target defines
diff --git a/packages/mozilla/firefox-1.0.5/jsautocfg.h b/packages/mozilla/firefox-1.0.5/jsautocfg.h
deleted file mode 100644
index 05f3dad50a..0000000000
--- a/packages/mozilla/firefox-1.0.5/jsautocfg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* Lovingly crafted by hand avoiding Mozilla stupidity */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  2L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/firefox-1.0.5/mozconfig b/packages/mozilla/firefox-1.0.5/mozconfig
deleted file mode 100644
index 025b396ac7..0000000000
--- a/packages/mozilla/firefox-1.0.5/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox-0.10.1/.mtn2git_empty b/packages/mozilla/firefox-1.0.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mozilla/firefox-0.10.1/.mtn2git_empty
+++ b/packages/mozilla/firefox-1.0.6/.mtn2git_empty
diff --git a/packages/mozilla/firefox-1.0.3/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0.6/firefox-cc-fix.patch
index e2df2a390c..e2df2a390c 100644
--- a/packages/mozilla/firefox-1.0.3/firefox-cc-fix.patch
+++ b/packages/mozilla/firefox-1.0.6/firefox-cc-fix.patch
diff --git a/packages/mozilla/firefox-1.0.3/jsautocfg.h b/packages/mozilla/firefox-1.0.6/jsautocfg.h
index 05f3dad50a..05f3dad50a 100644
--- a/packages/mozilla/firefox-1.0.3/jsautocfg.h
+++ b/packages/mozilla/firefox-1.0.6/jsautocfg.h
diff --git a/packages/mozilla/firefox-0.10.1/mozconfig b/packages/mozilla/firefox-1.0.6/mozconfig
index 025b396ac7..025b396ac7 100644
--- a/packages/mozilla/firefox-0.10.1/mozconfig
+++ b/packages/mozilla/firefox-1.0.6/mozconfig
diff --git a/packages/mozilla/firefox-1.0/.mtn2git_empty b/packages/mozilla/firefox-1.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mozilla/firefox-1.0/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mozilla/firefox-1.0/firefox-cc-fix.patch b/packages/mozilla/firefox-1.0/firefox-cc-fix.patch
deleted file mode 100644
index e2df2a390c..0000000000
--- a/packages/mozilla/firefox-1.0/firefox-cc-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/js/src/Makefile.in	2004-03-31 09:38:54.000000000 -0700
-+++ mozilla.new/js/src/Makefile.in	2004-11-12 16:29:32.856436952 -0700
-@@ -342,16 +342,10 @@
- 
- jsopcode.h jsopcode.c: jsopcode.tbl
- 
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
-+# OE hack - we copy this in 
- jsautocfg.h:
- 	touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--	@rm -f $@ jsautocfg.tmp
--	./jscpucfg > jsautocfg.tmp
--	mv jsautocfg.tmp $@
--endif
--
-+	
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
- # the mdcpucfg for the target so it needs the appropriate target defines
diff --git a/packages/mozilla/firefox-1.0/jsautocfg.h b/packages/mozilla/firefox-1.0/jsautocfg.h
deleted file mode 100644
index 05f3dad50a..0000000000
--- a/packages/mozilla/firefox-1.0/jsautocfg.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* Lovingly crafted by hand avoiding Mozilla stupidity */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  2L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/firefox-1.0/mozconfig b/packages/mozilla/firefox-1.0/mozconfig
deleted file mode 100644
index 025b396ac7..0000000000
--- a/packages/mozilla/firefox-1.0/mozconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# use GTK+-2 widget set with XFT font rendering
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-#ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-#ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xprint
-ac_add_options --disable-necko-disk-cache
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-#ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-#ac_add_options --enable-reorder
-#ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
diff --git a/packages/mozilla/firefox_0.10.1.bb b/packages/mozilla/firefox_0.10.1.bb
deleted file mode 100644
index 9df9cc0e34..0000000000
--- a/packages/mozilla/firefox_0.10.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://mozilla-firefox.png file://mozilla-firefox.desktop"
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
diff --git a/packages/mozilla/firefox_0.9.2.bb b/packages/mozilla/firefox_0.9.2.bb
deleted file mode 100644
index 5924068c93..0000000000
--- a/packages/mozilla/firefox_0.9.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "r10"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://mozilla-firefox.png file://mozilla-firefox.desktop"
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
diff --git a/packages/mozilla/firefox_0.9.3.bb b/packages/mozilla/firefox_0.9.3.bb
deleted file mode 100644
index 7cf33da9e9..0000000000
--- a/packages/mozilla/firefox_0.9.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "r2"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://extensions-hack.patch;patch=1 \
-	file://mozilla-firefox.png file://mozilla-firefox.desktop"
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
diff --git a/packages/mozilla/firefox_0.9.bb b/packages/mozilla/firefox_0.9.bb
deleted file mode 100644
index ec0d84a57a..0000000000
--- a/packages/mozilla/firefox_0.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-PR = "r3"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://mozilla-firefox.png file://mozilla-firefox.desktop"
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
diff --git a/packages/mozilla/firefox_1.0.4.bb b/packages/mozilla/firefox_1.0.4.bb
deleted file mode 100644
index b3eeedcf64..0000000000
--- a/packages/mozilla/firefox_1.0.4.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
-	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1"
-
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
-
-do_compile_prepend() {
-	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-}
-
diff --git a/packages/mozilla/firefox_1.0.5.bb b/packages/mozilla/firefox_1.0.5.bb
deleted file mode 100644
index b3eeedcf64..0000000000
--- a/packages/mozilla/firefox_1.0.5.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
-	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1"
-
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
-
-do_compile_prepend() {
-	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-}
-
diff --git a/packages/mozilla/firefox_1.0.3.bb b/packages/mozilla/firefox_1.0.6.bb
index b3eeedcf64..b3eeedcf64 100644
--- a/packages/mozilla/firefox_1.0.3.bb
+++ b/packages/mozilla/firefox_1.0.6.bb
diff --git a/packages/mozilla/firefox_1.0.bb b/packages/mozilla/firefox_1.0.bb
deleted file mode 100644
index 9e34c3d4fa..0000000000
--- a/packages/mozilla/firefox_1.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-PR = "r0"
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
-	file://xptcstubs.patch;patch=1 \
-	file://no-xmb.patch;patch=1 \
-	file://firefox-cc-fix.patch;patch=1 \
-	file://jsautocfg.h \
-	file://extensions-hack.patch;patch=1"
-
-S = "${WORKDIR}/mozilla"
-
-inherit mozilla
-
-include firefox.inc
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie
new file mode 100644
index 0000000000..dddb7caa0d
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/opie
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+# we need to tinker directly with qws_display until the ODevice
+# default (which is now W100:Rot0:0) works flawlessly with rotation
+# and survives a suspend/resume cycle
+export QWS_DISPLAY=Transformed:Rot0:0
+# export QWS_DISPLAY=W100:Rot0:0
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
+    echo Opie not installed
+    exit 0 
+fi
+
+. /etc/profile
+
+for conf in $OPIEDIR/etc/skel/*.conf; do
+	conf_basename=`basename $conf`
+	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
+		echo "Copying default $conf_basename into $HOME/Settings/"
+		mkdir -p $HOME/Settings/
+		cat $conf >$HOME/Settings/$conf_basename
+	fi
+done
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+    mkdir -p $HOME/systeminfo/
+    echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+    ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+    /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+    
+    if [ -x "$OPIEDIR/bin/opie-login" ]; then
+            echo Starting Opie-login....
+            $OPIEDIR/bin/opie-login -terminal 2
+    else
+        $OPIEDIR/bin/opie-reorgfiles
+        if [ -x /usr/bin/ssh-agent ]; then
+             SSHAGENT=/usr/bin/ssh-agent
+        else
+             SSHAGENT=""
+        fi
+        
+        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+        fi           
+        echo Starting Opie....
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+    fi
+
+    ;;
+
+'stop')
+    echo "Stopping Opie..."
+    killall qpe 2>/dev/null
+    killall opie-login 2>/dev/null
+    killall quicklauncher 2>/dev/null
+
+    ;;
+
+'restart')
+	$0 stop && $0 start
+
+	;;
+
+*)
+    echo "usage: $0 { start | stop | restart }"
+
+    ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 88bfd4fd34..0d9452523e 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -3,13 +3,11 @@
 [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
 [ -z $HOME ] && export HOME=/home/$LOGNAME
 
-export QWS_DISPLAY=Transformed:Rot0:0
 export QTDIR=/opt/QtPalmtop
 export OPIEDIR=/opt/QtPalmtop
 export QPEDIR=/opt/QtPalmtop
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
 export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
 
 if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
     echo Opie not installed
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index f1fd277a9e..ad403c09f1 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,7 +1,7 @@
 include ${PN}.inc
     
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
index d7b285e8ec..5bb5af8598 100644
--- a/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools-native_2.0r2.bb
@@ -1,4 +1,4 @@
-include ${PN_BASE}_${PV}.bb
+include squashfs-tools_${PV}.bb
 
 DEPENDS = "lzma-native"
 PN_BASE = "squashfs-tools"