merge of '16b2b0213ee4ffed03286c1d3a6c02a47de6cbac'

     and '4f147d2d94a319ec848b2853d52d9065acfa63d5'

10 files changed, 118 insertions, 17 deletions

diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index a246633e07..8d586e1db4 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -8,5 +8,70 @@ PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 
-# - the GPE roadmap doesn't state any versions for 2.8 yet
-#   http://www.handhelds.org/moin/moin.cgi/GPERoadmap
+#specify versions, as the header says :)
+PREFERRED_VERSION_glib-2.0 ?= "2.8.6"
+PREFERRED_VERSION_pango ?= "1.8.2"
+PREFERRED_VERSION_gtk+ ?= "2.6.10"
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
+PREFERRED_VERSION_librsvg ?= "2.16.1"
+
+PREFERRED_VERSION_libgpewidget ?= "0.115"
+PREFERRED_VERSION_libgpepimc ?= "0.9"
+PREFERRED_VERSION_libgpevtype ?= "0.50"
+PREFERRED_VERSION_libschedule ?= "0.17"
+PREFERRED_VERSION_libcontactsdb ?= "0.5"
+PREFERRED_VERSION_libtododb ?= "0.11"
+PREFERRED_VERSION_libhandoff ?= "0.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.1"
+PREFERRED_VERSION_libsoundgen ?= "0.6"
+
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+
+PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_startup-monitor ?= "0.18-2"
+PREFERRED_VERSION_gpe-dm ?= "0.51"
+
+PREFERRED_VERSION_gpe-todo ?= "0.56"
+PREFERRED_VERSION_gpe-calendar ?= "0.91"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-contacts ?= "0.47"
+PREFERRED_VERSION_gpe-beam ?= "0.2.9" 
+PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.9"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
+PREFERRED_VERSION_minilite ?= "0.50"
+PREFERRED_VERSION_gpe-edit ?= "0.40"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.4"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.43"
+PREFERRED_VERSION_gpe-filemanager ?= "0.30"
+PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
+PREFERRED_VERSION_gpe-scap ?= "1.3"
+PREFERRED_VERSION_gpesyncd ?= "2.0"
+PREFERRED_VERSION_gpe-synctool ?= "0.2"
+PREFERRED_VERSION_gpe-announce ?= "0.13"
+PREFERRED_VERSION_gpe-timesheet ?= "0.32"
+PREFERRED_VERSION_gpe-irc ?= "0.08"
+PREFERRED_VERSION_starling ?= "0.2"
+
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+
+PREFERRED_VERSION_vlc-gpe ?= "0.8.4"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
diff --git a/packages/gpe-package/gpe-package_0.4.bb b/packages/gpe-package/gpe-package_0.4.bb
new file mode 100644
index 0000000000..65b4ac138b
--- /dev/null
+++ b/packages/gpe-package/gpe-package_0.4.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+PR = "r0"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "ipkg libpcre libgpewidget"
+RDEPENDS = "gpe-icons gpe-su"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \
+		file://gpe-package"
+
+FILES_${PN} += " /usr/bin/gpe-package"
+
+CFLAGS += "-DENABLE_PCRE"
+LDFLAGS += "-lpcre"
+
+do_install_append() {
+	install -d ${D}${bindir}
+	install -m 0755 ${WORKDIR}/gpe-package ${D}${bindir}
+}
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 5a0632ff37..aa851cf68f 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -1,5 +1,5 @@
 
-PR = "r21"
+PR = "r22"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -23,7 +23,14 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe-base task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-games"
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
+           task-gpe-base \
+           task-gpe-apps \
+           task-gpe-pim \
+           task-gpe-settings \
+           task-gpe-games \
+           virtual/xserver"
+
 RDEPENDS = "${PACKAGE_INSTALL}"
 
 export PACKAGE_INSTALL = "\
diff --git a/packages/images/gpephone-image.bb b/packages/images/gpephone-image.bb
index e9735f19c4..21496cae55 100644
--- a/packages/images/gpephone-image.bb
+++ b/packages/images/gpephone-image.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 export IMAGE_BASENAME = "gpephone-image"
 
@@ -20,7 +20,7 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone virtual/xserver"
 RDEPENDS = "${PACKAGE_INSTALL}"
 
 export PACKAGE_INSTALL = "\
diff --git a/packages/libw100/libw100_0.0.2.bb b/packages/libw100/libw100_0.0.2.bb
index f2117cb0a7..867eb68b58 100644
--- a/packages/libw100/libw100_0.0.2.bb
+++ b/packages/libw100/libw100_0.0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
 LICENSE = "GPLv2"
 
-SRC_URI = "svn://libw100.svn.sf.net/svnroot/libw100/tags;module=rev_0_0_2;proto=https"
+SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100/tags;module=rev_0_0_2;proto=https"
 
 S = "${WORKDIR}/rev_0_0_2"
 
diff --git a/packages/libw100/libw100_svn.bb b/packages/libw100/libw100_svn.bb
index 930582d27f..f8d5544625 100644
--- a/packages/libw100/libw100_svn.bb
+++ b/packages/libw100/libw100_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
 LICENSE = "GPLv2"
 
 PV = "0.0.2+svn${SRCDATE}"
-SRC_URI = "svn://libw100.svn.sf.net/svnroot/libw100;module=trunk;proto=https"
+SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100;module=trunk;proto=https"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index 821142949a..b587578120 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
 RDEPENDS = "\
-    diet-x11 \
-    virtual/xserver \
+    virtual/libx11 \
     gpe-bootsplash \
     bluez-utils-dbus \
     matchbox \
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 619ac7d5a5..8bf39d8af9 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -13,8 +13,7 @@ PACKAGES = "\
     gpephone-task-development"
 
 RDEPENDS_gpephone-base-depends = "\
-    diet-x11 \
-    virtual/xserver"
+    virtual/libx11"
 
 RDEPENDS_gpephone-task-development = "\
     rxvt-unicode \
diff --git a/packages/ttf-fonts/ttf-dejavu_2.15.bb b/packages/ttf-fonts/ttf-dejavu_2.18.bb
index c1b743aa1b..d68ac61cb4 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.15.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.18.bb
@@ -1,18 +1,27 @@
 DESCRIPTION = "DejaVu font - TTF Edition"
 LICENSE = "Bitstream Vera"
 HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page"
+RDEPENDS = "ttf-dejavu-common"
+RDEPENDS_ttf-dejavu-common = ""
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2 \
+           file://30-dejavu-aliases.conf"
 
 require ttf.inc
 
 S = "${WORKDIR}/dejavu-ttf-${PV}"
 
+do_install_append () { 
+	install -d ${D}${sysconfdir}/fonts/conf.d/
+	install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
+}
+
 PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \
-	    ttf-dejavu-serif ttf-dejavu-serif-condensed"
+	    ttf-dejavu-serif ttf-dejavu-serif-condensed ttf-dejavu-common"
 
 FILES_ttf-dejavu-sans            = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf"
 FILES_ttf-dejavu-sans-mono       = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf"
 FILES_ttf-dejavu-sans-condensed  = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf"
 FILES_ttf-dejavu-serif           = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf"
 FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf"
+FILES_ttf-dejavu-common          = "${sysconfdir}"
diff --git a/packages/vincent/vincent_svn.bb b/packages/vincent/vincent_svn.bb
index b8c188b36f..f872f727be 100644
--- a/packages/vincent/vincent_svn.bb
+++ b/packages/vincent/vincent_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 PV = "0.0+svn${SRCDATE}"
 PR = "r0"
 
-SRC_URI = "svn://ogl-es.svn.sf.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https"
+SRC_URI = "svn://ogl-es.svn.sourceforge.net/svnroot/ogl-es/branches;module=linux_nokia_770;proto=https"
 
 S = "${WORKDIR}/linux_nokia_770/ogles/projects/linux-x11"