Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/01 18:36:32+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 18:35:06+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 19:34:59+01:00 hrw.one.pl!hrw
add missing patch to gtk+ 2.6.0

2005/01/01 19:24:58+01:00 hrw.one.pl!hrw
added missing dependencies to librsvg

2005/01/01 19:23:00+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/01 19:17:46+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/01/01 10:40:49-08:00 (none)!ggilbert
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into olddog.(none):/home/ggilbert/oe/openembedded

2005/01/01 10:40:21-08:00 (none)!ggilbert
Many files:
  Adding more LICENSES

2005/01/01 18:34:46+00:00 nexus.co.uk!pb
add gpe-lights to gpe-task-games

2005/01/01 19:17:34+01:00 handhelds.org!CoreDump
prboom_2.3.1.bb:
  prboom: Set DEFAULT_PREFERRENCE = -1 for 2.3.1
prboom_2.2.6.bb, prboom.png, prboom.desktop, m4.patch:
  new file

2005/01/01 17:39:51+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/01 17:39:24+00:00 nexus.co.uk!pb
disable JIS encodings in rxvt-unicode

2005/01/01 17:17:42+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2005/01/01 16:50:14+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded

2004/12/31 23:30:31+01:00 hrw.one.pl!hrw
removed verdana & georgia fonts from meta-opie due to LICENSE

BKrev: 41d6eeb7-0v1WWxOR9ezdVHMi6M7xA

43 files changed, 526 insertions, 7 deletions

diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb
index f328c50fc5..69588475d4 100644
--- a/packages/gpe-beam/gpe-beam_0.2.3.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.3.bb
@@ -1,5 +1,5 @@
 inherit gpe pkgconfig
-
+LICENSE = "GPL"
 DESCRIPTION = "GPE infrared communication applet"
 DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex"
 RDEPENDS = "libopenobex-1.0-1"
diff --git a/packages/gpe-conf/gpe-conf_0.1.17.bb b/packages/gpe-conf/gpe-conf_0.1.17.bb
index e69de29bb2..18f37b2a90 100644
--- a/packages/gpe-conf/gpe-conf_0.1.17.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.17.bb
@@ -0,0 +1,20 @@
+PR = "r1"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp"
+RDEPENDS = "xset xst ipaq-sleep ntpdate"
+SECTION = "gpe"
+PRIORITY = "optional"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps"
+
+do_compile () {
+	oe_runmake PREFIX=${prefix}
+	oe_runmake all-desktop PREFIX=${prefix}
+}
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+}
+
diff --git a/packages/gpe-conf/gpe-conf_0.1.19.bb b/packages/gpe-conf/gpe-conf_0.1.19.bb
index e69de29bb2..5a93c38856 100644
--- a/packages/gpe-conf/gpe-conf_0.1.19.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.19.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-mixer"
+RDEPENDS = "xset xst ipaq-sleep ntpdate"
+SECTION = "gpe"
+PRIORITY = "optional"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps ${datadir}/gpe-conf"
+PR = "r1"
+
+do_compile () {
+	oe_runmake PREFIX=${prefix}
+	oe_runmake all-desktop PREFIX=${prefix}
+}
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+	rm -f ${D}/${datadir}/applications/gpe-conf.desktop
+}
+
diff --git a/packages/gpe-conf/gpe-conf_0.1.20.bb b/packages/gpe-conf/gpe-conf_0.1.20.bb
index e69de29bb2..3b6feb0419 100644
--- a/packages/gpe-conf/gpe-conf_0.1.20.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.20.bb
@@ -0,0 +1,27 @@
+PR = "r0"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-mixer"
+RDEPENDS = "xst xset ipaq-sleep ntpdate gpe-login gpe-mixer"
+SECTION = "gpe"
+PRIORITY = "optional"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps ${datadir}/gpe-conf"
+
+SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
+            file://password-if.patch;patch=1;pnum=0 \
+            file://meminfo26.patch;patch=1;pnum=0 \
+            file://misc1.patch;patch=1;pnum=0 \
+            file://hwclock.patch;patch=1;pnum=0 \
+            file://ntpdate.patch;patch=1;pnum=0"
+
+do_compile () {
+	oe_runmake PREFIX=${prefix}
+	oe_runmake all-desktop PREFIX=${prefix}
+}
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+	rm -f ${D}/${datadir}/applications/gpe-conf.desktop
+}
diff --git a/packages/gpe-conf/gpe-conf_0.1.21.bb b/packages/gpe-conf/gpe-conf_0.1.21.bb
index e69de29bb2..c3a8d0eadb 100644
--- a/packages/gpe-conf/gpe-conf_0.1.21.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.21.bb
@@ -0,0 +1,23 @@
+PR = "r2"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
+RDEPENDS = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps ${datadir}/gpe-conf"
+
+SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
+            file://icons.patch;patch=1;pnum=0"
+
+do_compile () {
+	oe_runmake PREFIX=${prefix}
+	oe_runmake all-desktop PREFIX=${prefix}
+}
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+}
+
diff --git a/packages/gpe-conf/gpe-conf_0.1.22.bb b/packages/gpe-conf/gpe-conf_0.1.22.bb
index 57c74f866f..0f4aa3bcbf 100644
--- a/packages/gpe-conf/gpe-conf_0.1.22.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.22.bb
@@ -1,5 +1,5 @@
 PR = "r4"
-
+LICENSE = "GPL"
 inherit gpe
 
 SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0 \
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.14.bb b/packages/gpe-filemanager/gpe-filemanager_0.14.bb
index e69de29bb2..57e3cd6e3f 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.14.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.14.bb
@@ -0,0 +1,8 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE file manager"
+
+FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.15.bb b/packages/gpe-filemanager/gpe-filemanager_0.15.bb
index e69de29bb2..57e3cd6e3f 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.15.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.15.bb
@@ -0,0 +1,8 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE file manager"
+
+FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.17.bb b/packages/gpe-filemanager/gpe-filemanager_0.17.bb
index e69de29bb2..57e3cd6e3f 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.17.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.17.bb
@@ -0,0 +1,8 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "libgpewidget sqlite gnome-vfs gnome-vfs-extras dbus"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE file manager"
+
+FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.20.bb b/packages/gpe-filemanager/gpe-filemanager_0.20.bb
index 3dbd40cf51..6c640ff2f3 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.20.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.20.bb
@@ -1,5 +1,5 @@
 inherit gpe
-
+LICENSE = "GPL"
 DESCRIPTION = "GPE file manager"
 DEPENDS = "libgpewidget gnome-vfs dbus"
 SECTION = "gpe"
diff --git a/packages/gpe-go/gpe-go_0.05.bb b/packages/gpe-go/gpe-go_0.05.bb
index e69de29bb2..2e0ce7c634 100644
--- a/packages/gpe-go/gpe-go_0.05.bb
+++ b/packages/gpe-go/gpe-go_0.05.bb
@@ -0,0 +1,10 @@
+inherit gpe
+LICENSE = "GPL"
+DESCRIPTION = "A Go Board for GPE."
+DEPENDS = "gtk+ libgpewidget gpe-icons"
+RDEPENDS = "gdk-pixbuf-loader-jpeg"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r1"
+
+SRC_URI += "file://fix-make.patch;patch=1"
diff --git a/packages/gpe-icons/gpe-icons_0.22.bb b/packages/gpe-icons/gpe-icons_0.22.bb
index e69de29bb2..4b04474b9a 100644
--- a/packages/gpe-icons/gpe-icons_0.22.bb
+++ b/packages/gpe-icons/gpe-icons_0.22.bb
@@ -0,0 +1,8 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = ""
+RDEPENDS = "gdk-pixbuf-loader-png"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+DESCRIPTION = "Common icons for GPE"
+FILES_${PN} = "${datadir}/gpe"
diff --git a/packages/gpe-icons/gpe-icons_0.24.bb b/packages/gpe-icons/gpe-icons_0.24.bb
index e69de29bb2..6c5aa05934 100644
--- a/packages/gpe-icons/gpe-icons_0.24.bb
+++ b/packages/gpe-icons/gpe-icons_0.24.bb
@@ -0,0 +1,9 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+RDEPENDS = "gdk-pixbuf-loader-png"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+DESCRIPTION = "Common icons for GPE"
+FILES_${PN} = "${datadir}/gpe"
+
diff --git a/packages/gpe-irc/gpe-irc_0.07.bb b/packages/gpe-irc/gpe-irc_0.07.bb
index e69de29bb2..fc08b72de3 100644
--- a/packages/gpe-irc/gpe-irc_0.07.bb
+++ b/packages/gpe-irc/gpe-irc_0.07.bb
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+LICENSE = "GPL"
+DESCRIPTION = "31337 IRC client."
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefile.patch;patch=1"
diff --git a/packages/gpe-lights/gpe-lights_0.12.bb b/packages/gpe-lights/gpe-lights_0.12.bb
index e69de29bb2..67f0ed60e0 100644
--- a/packages/gpe-lights/gpe-lights_0.12.bb
+++ b/packages/gpe-lights/gpe-lights_0.12.bb
@@ -0,0 +1,9 @@
+inherit gpe
+LICENSE = "PD"
+
+DESCRIPTION = "A simple light puzzle."
+DEPENDS = "gtk+ libgpewidget gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix-makefiles.patch;patch=1"
diff --git a/packages/gpe-mininet/gpe-mininet_0.4.bb b/packages/gpe-mininet/gpe-mininet_0.4.bb
index e69de29bb2..2ed9f76631 100644
--- a/packages/gpe-mininet/gpe-mininet_0.4.bb
+++ b/packages/gpe-mininet/gpe-mininet_0.4.bb
@@ -0,0 +1,17 @@
+inherit gpe pkgconfig
+
+PR = "r1"
+LICENSE = "GPL"
+DEPENDS = "libgpewidget gpe-icons gpe-conf matchbox-panel"
+SECTION = "gpe"
+
+DESCRIPTION = "GPE network connection checker"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+           file://netlink.patch;patch=1;pnum=0 \
+           file://mininet-main.patch;patch=1;pnum=0"
+
+FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps"
+
+export CVSBUILD=no
diff --git a/packages/gpe-package/gpe-package_0.0.10.bb b/packages/gpe-package/gpe-package_0.0.10.bb
index e69de29bb2..dbff969c80 100644
--- a/packages/gpe-package/gpe-package_0.0.10.bb
+++ b/packages/gpe-package/gpe-package_0.0.10.bb
@@ -0,0 +1,16 @@
+inherit gpe pkgconfig
+LICENSE = "GPL"
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "libipkg libgpewidget libdisplaymigration libgpepimc"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+#BROKEN = "1"
+PR = "r1"
+
+SRC_URI += "file://fix_makefile.patch;patch=1 \
+	    file://fix_interface_c.patch;patch=1"
+
+do_compile() {
+        oe_runmake STAGING_INCDIR="${STAGING_INCDIR}"
+}
diff --git a/packages/gpe-package/gpe-package_0.0.12.bb b/packages/gpe-package/gpe-package_0.0.12.bb
index e69de29bb2..7b4e802642 100644
--- a/packages/gpe-package/gpe-package_0.0.12.bb
+++ b/packages/gpe-package/gpe-package_0.0.12.bb
@@ -0,0 +1,14 @@
+
+PR = "r2"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "libipkg libgpewidget"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://use-filesel.patch;patch=1"
+
+FILES_{PN} += "${datadir}"
diff --git a/packages/gpe-package/gpe-package_0.0.9-1.bb b/packages/gpe-package/gpe-package_0.0.9-1.bb
index e69de29bb2..2a653c7db6 100644
--- a/packages/gpe-package/gpe-package_0.0.9-1.bb
+++ b/packages/gpe-package/gpe-package_0.0.9-1.bb
@@ -0,0 +1,14 @@
+inherit gpe
+LICENSE = "GPL"
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "libipkg libgpewidget libdisplaymigration libgpepimc"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1 \
+	    file://fix_interface_c.patch;patch=1"
+
+do_compile() {
+	oe_runmake STAGING_INCDIR="${STAGING_INCDIR}"
+}
diff --git a/packages/gpe-package/gpe-package_0.2.bb b/packages/gpe-package/gpe-package_0.2.bb
index e69de29bb2..990570fe7e 100644
--- a/packages/gpe-package/gpe-package_0.2.bb
+++ b/packages/gpe-package/gpe-package_0.2.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "libipkg libgpewidget"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://use-filesel.patch;patch=1"
diff --git a/packages/gpe-plucker/gpe-plucker_0.1.bb b/packages/gpe-plucker/gpe-plucker_0.1.bb
index e69de29bb2..b08c691312 100644
--- a/packages/gpe-plucker/gpe-plucker_0.1.bb
+++ b/packages/gpe-plucker/gpe-plucker_0.1.bb
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+LICENSE = "GPL"
+DESCRIPTION = "Plucker ebook reader"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/packages/gpe-shield/gpe-shield_0.2.bb b/packages/gpe-shield/gpe-shield_0.2.bb
index e69de29bb2..c255c25a21 100644
--- a/packages/gpe-shield/gpe-shield_0.2.bb
+++ b/packages/gpe-shield/gpe-shield_0.2.bb
@@ -0,0 +1,15 @@
+PR = "r1"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "libgpewidget iptables"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DESCRIPTION = "GPE network security tool"
+export CVSBUILD = no
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+           file://${FILESDIR}/makefile.patch;patch=1;pnum=0"
+
+
diff --git a/packages/gpe-shield/gpe-shield_0.3.bb b/packages/gpe-shield/gpe-shield_0.3.bb
index e69de29bb2..5be2c5eb1a 100644
--- a/packages/gpe-shield/gpe-shield_0.3.bb
+++ b/packages/gpe-shield/gpe-shield_0.3.bb
@@ -0,0 +1,14 @@
+PR = "r0"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "libgpewidget iptables"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DESCRIPTION = "GPE network security tool"
+export CVSBUILD = no
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+
diff --git a/packages/gpe-shield/gpe-shield_0.4.bb b/packages/gpe-shield/gpe-shield_0.4.bb
index e69de29bb2..0280a310b3 100644
--- a/packages/gpe-shield/gpe-shield_0.4.bb
+++ b/packages/gpe-shield/gpe-shield_0.4.bb
@@ -0,0 +1,15 @@
+PR = "r0"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "libgpewidget iptables"
+RDEPENDS = "iptables"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DESCRIPTION = "GPE network security tool"
+export CVSBUILD = no
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+
diff --git a/packages/gpe-shield/gpe-shield_0.6.bb b/packages/gpe-shield/gpe-shield_0.6.bb
index e69de29bb2..6b1e1829d4 100644
--- a/packages/gpe-shield/gpe-shield_0.6.bb
+++ b/packages/gpe-shield/gpe-shield_0.6.bb
@@ -0,0 +1,15 @@
+PR = "r2"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "libgpewidget iptables"
+RDEPENDS = "iptables"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DESCRIPTION = "GPE network security tool"
+export CVSBUILD = no
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+           file://backend-iptables.patch;patch=1;pnum=0 \
+           file://desktop-name.patch;patch=1;pnum=0"
diff --git a/packages/gpe-shield/gpe-shield_0.7.bb b/packages/gpe-shield/gpe-shield_0.7.bb
index e69de29bb2..5146502f4f 100644
--- a/packages/gpe-shield/gpe-shield_0.7.bb
+++ b/packages/gpe-shield/gpe-shield_0.7.bb
@@ -0,0 +1,9 @@
+inherit gpe pkgconfig
+LICENSE = "GPL"
+DEPENDS = "libgpewidget iptables"
+RDEPENDS = "iptables"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DESCRIPTION = "GPE network security tool"
+
diff --git a/packages/gpe-terminal/gpe-terminal_1.1.bb b/packages/gpe-terminal/gpe-terminal_1.1.bb
index e69de29bb2..578f02b712 100644
--- a/packages/gpe-terminal/gpe-terminal_1.1.bb
+++ b/packages/gpe-terminal/gpe-terminal_1.1.bb
@@ -0,0 +1,11 @@
+SECTION = "gpe"
+SRC_URI = "file://${PN}.desktop file://${PN}.png"
+DESCRIPTION = "GPE terminal wrapper"
+PV = "1.1"
+LICENSE = "GPL"
+do_install() {
+	install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/${PN}.desktop ${D}${datadir}/applications/
+	install -m 0644 ${WORKDIR}/${PN}.png ${D}${datadir}/pixmaps/
+}
diff --git a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb b/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb
index e69de29bb2..1c7468656f 100644
--- a/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-theme-foxbox/gpe-theme-foxbox_0.1.bb
@@ -0,0 +1,14 @@
+inherit gpe
+
+LICENSE = "gpe-theme-foxbox"
+PR = "r1"
+SECTION = "x11/base"
+DESCRIPTION = "Simple GPE theme using the Smooth theming engine."
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DEPENDS = "gtk-smooth-engine"
+RDEPENDS = "gtk-smooth-engine"
+S = ${WORKDIR}/foxbox
+
+FILES_${PN} = "${datadir}/themes"
+
+SRC_URI = "http://handhelds.org/~florian/themes/foxbox-${PV}.tar.gz"
diff --git a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb
index e69de29bb2..38262f98cc 100644
--- a/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb
+++ b/packages/gpe-wlancfg/gpe-wlancfg_0.2.6.bb
@@ -0,0 +1,14 @@
+PR = "r1"
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DEPENDS = "libgpewidget flex"
+SECTION = "gpe"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+RDEPENDS = "gpe-su"
+
+DESCRIPTION = "GPE wireless LAN configuration tool"
+export CVSBUILD = no
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+           file://${FILESDIR}/gpe-wlancfg-makefile.patch;patch=1;pnum=0"
diff --git a/packages/gsoko/gsoko_0.4.2-gpe5.bb b/packages/gsoko/gsoko_0.4.2-gpe5.bb
index e69de29bb2..0d12a6fd06 100644
--- a/packages/gsoko/gsoko_0.4.2-gpe5.bb
+++ b/packages/gsoko/gsoko_0.4.2-gpe5.bb
@@ -0,0 +1,8 @@
+inherit gpe
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+DESCRIPTION = "Sokoban game for GTK"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/packages/gtk+/gtk+-2.6.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.6.0/gtklabel-resize-patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/gtk+-2.6.0/gtklabel-resize-patch
diff --git a/packages/librsvg/librsvg_2.6.5.bb b/packages/librsvg/librsvg_2.6.5.bb
index e69de29bb2..6796b342af 100644
--- a/packages/librsvg/librsvg_2.6.5.bb
+++ b/packages/librsvg/librsvg_2.6.5.bb
@@ -0,0 +1,20 @@
+SECTION = "x11/utils"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libart-lgpl libxml2 popt"
+PR = "r2"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig gnome
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/librsvg-2/librsvg/
+	install -m 0644 rsvg.h ${STAGING_INCDIR}/librsvg-2/librsvg/
+	install -m 0644 librsvg-features.h ${STAGING_INCDIR}/librsvg-2/librsvg/
+	oe_libinstall -so -a librsvg-2 ${STAGING_LIBDIR}
+}
diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
index e69de29bb2..d4fc63d6b9 100644
--- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
+++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Simple dockapps created with monolaunch and shell script"
+DEPENDS = "matchbox xmodmap"
+SRC_URI = "file://xrandr-panelapp.sh \
+	   file://xrandr-panelapp.desktop \
+	   file://xrandr.png"
+SECTION = "x11/wm"
+PRIORITY = "optional"
+PR = "r1"
+LICENSE = "MIT"
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -d ${D}/${datadir}/applications
+        install -d ${D}/${datadir}/pixmaps
+	install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}/${bindir}/
+	install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}/${datadir}/applications/
+	install -m 0644 ${WORKDIR}/xrandr.png ${D}/${datadir}/pixmaps/
+}
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 8a3568055d..cc1240d013 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,7 +1,7 @@
 PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r28"
+PR = "r29"
 
 ALLOW_EMPTY = 1
 
@@ -94,6 +94,7 @@ DEPENDS += " ${gpe-task-apps}"
 gpe-task-games = "\
     gpe-tetris \
     gpe-othello \
+    gpe-lights \
     xdemineur"
 
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 5dae95ee99..87c12b8f60 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r17"
+PR = "r18"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
@@ -379,11 +379,9 @@ RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
 DEPENDS += " ${task-qpe-emulators}"
 
 task-qpe-fonts = "\
-qpf-georgia \
 qpf-helvetica \
 qpf-unifont \
 qpf-utopia \
-qpf-verdana \
 terminus \
 qpf-bitstream-vera-sans-mono \
 qpf-bitstream-vera \
diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb
index e69de29bb2..3b82ae7dbb 100644
--- a/packages/mime-support/mime-support_3.28.bb
+++ b/packages/mime-support/mime-support_3.28.bb
@@ -0,0 +1,54 @@
+SECTION = "base"
+DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+
+DEPENDS = "file"
+RRECOMMENDS = "file"
+LICENSE = "PD"
+SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
+S = "${WORKDIR}/${PN}"
+
+PACKAGES = "${PN} ${PN}-doc"
+FILES_${PN} += " ${libdir}/mime"
+
+docdir_append = "/${PN}"
+
+do_install () {
+	install -d ${D}/${sysconfdir}
+	install -d ${D}/${libdir}/mime/packages
+	install -d ${D}/${docdir}
+	install -d ${D}/${sbindir}
+	install -d ${D}/${bindir}
+	install -d ${D}/${mandir}/man1
+	install -d ${D}/${mandir}/man5
+	install -d ${D}/${mandir}/man8
+	install -m 644 mime.types 		${D}/${sysconfdir}/
+	install -m 644 mailcap    		${D}/${libdir}/mime/
+	install -m 644 mailcap.order   		${D}/${sysconfdir}/
+	install -m 644 mailcap.man		${D}/${mandir}/man5/mailcap.5
+	install -m 644 mailcap.order.man	${D}/${mandir}/man5/mailcap.order.5
+#	install -m 755 install-mime		${D}/${sbindir}/
+#	install -m 644 install-mime.man		${D}/${mandir}/man8/install-mime.8
+	install -m 755 update-mime		${D}/${sbindir}/
+	install -m 644 update-mime.man		${D}/${mandir}/man8/update-mime.8
+	install -m 755 run-mailcap		${D}/${bindir}/
+	install -m 644 run-mailcap.man		${D}/${mandir}/man1/run-mailcap.1
+#	install -m 644 rfcs/*			${D}/${docdir}/
+	install -m 644 debian/changelog		${D}/${docdir}/changelog.Debian
+	install -m 644 debian/README		${D}/${docdir}/copyright
+	install -m 755 debian-view		${D}/${libdir}/mime/
+	install -m 755 playaudio		${D}/${libdir}/mime/
+	install -m 755 playdsp			${D}/${libdir}/mime/
+	install -m 644 mailcap.entries		${D}/${libdir}/mime/packages/mime-support
+	cd ${D}/${mandir}; gzip -9fv */*
+	cd ${D}/${docdir}; gzip -9v *
+	cd ${D}/${docdir}; gunzip copyright.gz
+	cd ${D}/${bindir}; ln -s run-mailcap see
+	cd ${D}/${bindir}; ln -s run-mailcap edit
+	cd ${D}/${bindir}; ln -s run-mailcap compose
+	cd ${D}/${bindir}; ln -s run-mailcap print
+	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz
+	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz
+	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz
+	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
+}
diff --git a/packages/pad/pad-native.bb b/packages/pad/pad-native.bb
index e69de29bb2..e8c2b6d579 100644
--- a/packages/pad/pad-native.bb
+++ b/packages/pad/pad-native.bb
@@ -0,0 +1,15 @@
+SECTION = "console/utils"
+DESCRIPTION = "Console utility for padding a file (filling with 0 to reach a specified length)"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pad"
+SRC_URI = "file://pad.c"
+LICENSE = "PD"
+inherit native
+
+do_compile() {
+	cp ${WORKDIR}/pad.c .
+	${CC} -I. -o pad pad.c
+}
+
+do_stage() {
+	install -m 0755 pad ${STAGING_BINDIR}/
+}
diff --git a/packages/prboom/prboom-2.2.6/m4.patch b/packages/prboom/prboom-2.2.6/m4.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/m4.patch
diff --git a/packages/prboom/prboom-2.2.6/prboom.desktop b/packages/prboom/prboom-2.2.6/prboom.desktop
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/prboom.desktop
diff --git a/packages/prboom/prboom-2.2.6/prboom.png b/packages/prboom/prboom-2.2.6/prboom.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom-2.2.6/prboom.png
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prboom/prboom_2.2.6.bb
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 31330ce641..2990bb4350 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -4,6 +4,11 @@ PRIORITY = "optional"
 DEPENDS = "libsdl-qpe libsdl-mixer libsdl-net"
 LICENSE = "GPL"
 
+# This version can be started w/ -height 240 but it
+# a) doesn't load doom1.wad (crash)
+# b) crahes a few seconds after starting w/ doom2.wad
+DEFAULT_PREFERRENCE = -1
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://m4.patch;patch=1 \
            file://prboom.png \
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.7.bb b/packages/rxvt-unicode/rxvt-unicode_4.7.bb
index e69de29bb2..335448ccf3 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.7.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.7.bb
@@ -0,0 +1,55 @@
+SECTION = "x11/utils"
+DEPENDS = "x11 xt libxft"
+DESCRIPTION = "rxvt-unicode is a clone of the well known \
+terminal emulator rxvt, modified to store text in Unicode \
+(either UCS-2 or UCS-4) and to use locale-correct input and \
+output. It also supports mixing multiple fonts at the \
+same time, including Xft fonts."
+PR = "r2"
+LICENSE = "GPL"
+SRC_URI = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PV}.tar.bz2 \
+	   file://xwc.patch;patch=1 \
+	   file://signedchar.patch;patch=1"
+
+inherit autotools update-alternatives
+
+PROVIDES = "virtual/x-terminal-emulator"
+ALTERNATIVE_NAME = "x-terminal-emulator"
+ALTERNATIVE_PATH = "${bindir}/rxvt"
+
+CFLAGS_append = " -fpermissive"
+
+EXTRA_OECONF = "--enable-menubar --enable-xim \
+		--enable-utmp --enable-wtmp --enable-lastlog \
+		--disable-strings --with-term=rxvt --enable-keepscrolling \
+		--enable-xft --with-name=rxvt --enable-frills \
+		--enable-swapscreen --enable-transparency \
+		--with-codesets=eu \
+		--enable-cursor-blink --enable-pointer-blank \
+		--enable-text-blink --enable-plain-scroll \
+		--enable-combining --enable-shared \
+		--enable-xgetdefault \
+		--with-x=${STAGING_LIBDIR}/.."
+EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
+		'XLIB=-L${STAGING_LIBDIR} -lX11'"
+
+do_configure () {
+	mv autoconf/configure.in . || true
+	rm autoconf/libtool.m4
+	libtoolize --force
+	autotools_do_configure
+	echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
+	echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
+	echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
+	echo '#define HAVE_XLOCALE 1' >> config.h
+}
+
+do_compile () {
+	if test -e ${S}/${HOST_SYS}-libtool; then
+		LIBTOOL=${S}/${HOST_SYS}-libtool
+	else
+		LIBTOOL=${S}/libtool
+	fi
+	# docs need "yodl" and I have no idea what that is
+	oe_runmake -C src "LIBTOOL=$LIBTOOL"
+}