Merge bk://openembedded@openembedded.bkbits.net/packages

into chris.(none):/home/cwiiis/oe/packages

2004/09/11 12:35:58+01:00 (none)!cwiiis
Add dillo2 to OE and include it in meta-gpe.

BKrev: 4142e371cADwUiF8TbzIZQjZaWb-LQ

diff --git a/dillo/dillo2-0.6.6/dillo.desktop b/dillo/dillo2-0.6.6/dillo.desktop
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dillo/dillo2-0.6.6/dillo.png b/dillo/dillo2-0.6.6/dillo.png
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dillo/dillo2-0.6.6/dillorc b/dillo/dillo2-0.6.6/dillorc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dillo/dillo2-0.6.6/fix_about_syntax.patch b/dillo/dillo2-0.6.6/fix_about_syntax.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dillo/dillo2_0.6.6.oe b/dillo/dillo2_0.6.6.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index fc2bc0b..905853c 100644 (file)
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -1,7 +1,7 @@
 PACKAGES = gpe gpe-task-base gpe-task-utils gpe-task-pim
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r11"
+PR = "r12"
 
 ALLOW_EMPTY = 1
 
@@ -35,7 +35,8 @@ gpe-task-pim = "\
     gpe-calendar \
     gpe-sketchbook \
     gpe-contacts \
-    gpe-today"
+    gpe-today \
+    dillo2"
 RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
 DEPENDS += " ${gpe-task-pim}"
 
@@ -49,7 +50,6 @@ gpe-task-utils = "\
     gpe-wlancfg \
     gpe-gallery \
     gpe-calculator \
-    gpe-plucker \
     minilite \
     gpe-taskmanager \
     gpe-package \