merge of '331c796786f820575978cca1b06ff1676cbbfb45'

     and '727e71965e5388b1cca1ae5bda4b54f7cdd317b7'

6 files changed, 8 insertions, 60 deletions

diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb
deleted file mode 100644
index 512f0453a1..0000000000
--- a/packages/fuse/fuse-module_2.4.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
-
-LICENSE = "GPL"
-
-
-DEPENDS = "fakeroot-native"
-RRECOMMEND = "fuse"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
-S = "${WORKDIR}/fuse-${PV}"
-
-inherit autotools pkgconfig module
-EXTRA_OECONF = "  --with-kernel=${STAGING_KERNEL_DIR}"
-
-do_configure() {
-cd ${S} ; oe_runconf
-}
-
-do_compile(){
-LDFLAGS=""
-cd ${S}/kernel
-oe_runmake
-}
-
-fakeroot do_install() {
-LDFLAGS=""
-cd ${S}/kernel
-oe_runmake install DESTDIR=${D}
-}
-
-FILES_${PN} = "/dev /lib/modules"
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
index 94cd87c603..0b887ba4bc 100644
--- a/packages/fuse/fuse-module_2.5.3.bb
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -6,7 +6,9 @@ LICENSE = "GPL"
 
 
 DEPENDS = "fakeroot-native"
-RRECOMMEND = "fuse"
+RRECOMMENDS = "fuse"
+
+PR = "r1"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
 S = "${WORKDIR}/fuse-${PV}"
diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb
deleted file mode 100644
index a51c659153..0000000000
--- a/packages/fuse/fuse_2.4.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-HOMEPAGE = "http://fuse.sf.net"
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
-
-LICENSE_${PN} = "LGPL"
-
-DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module"
-
-SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
-
-inherit autotools pkgconfig
-EXTRA_OECONF = " --disable-kernel-module"
-
-fakeroot do_install() {
-oe_runmake install DESTDIR=${D}
-}
-
-fakeroot do_stage() {
-autotools_stage_all
-}
-
-
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index 8aa1f3578d..2f893d5192 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -4,8 +4,10 @@ MAINTAINER = "Koen Kooi <koen@linuxtogo.org>"
 
 LICENSE_${PN} = "LGPL"
 
+PR = "r1"
+
 DEPENDS = "fakeroot-native"
-RRECOMMENDS_${PN} = "fuse-module"
+RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse"
 
 #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils 
 PACKAGES += "fuse-utils"
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
index dcf8640611..ed69f01df1 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
@@ -1,5 +1,5 @@
 LICENSE =	"GPL"
-DESCIPTION =	"Buttonbox for gpe"
+DESCRIPTION =	"Buttonbox for gpe"
 MAINTAINER =	"Koen Kooi <koen@linuxtogo.org>"
 
 DEPENDS =	"libgpewidget libgpelaunch"
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
index 86e5cabcf0..f982c4517f 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
@@ -1,6 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 LICENSE = "GPL"
-DESCIPTION = "Buttonbox for gpe"
+DESCRIPTION = "Buttonbox for gpe"
 
 SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox"