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

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

2005/01/01 15:33:31+00:00 nexus.co.uk!pb
add RPROVIDES for audiofile

2005/01/01 15:33:09+00:00 nexus.co.uk!pb
remove xprop from meta-gpe and meta-sectest-gpe


2005/01/01 15:32:04+00:00 nexus.co.uk!pb
relegate iptables-save and iptables-restore to iptables-utils package

2005/01/01 14:52:58+00:00 nexus.co.uk!pb
fix xprop to use libXmuu, not libXmu


2005/01/01 14:50:18+00:00 nexus.co.uk!pb
fix xrdb to use libXmuu, not libXmu


2005/01/01 14:49:45+00:00 nexus.co.uk!pb
fix xhost to use libXmuu, not libXmu


2005/01/01 14:46:05+00:00 nexus.co.uk!pb
fix xset to use libXmuu, not libXmu


2005/01/01 14:45:23+00:00 nexus.co.uk!pb
update gpe-contacts to 0.34


2005/01/01 14:44:56+00:00 nexus.co.uk!pb
fix xauth to use libXmuu, not libXmu


2005/01/01 14:42:26+00:00 nexus.co.uk!pb
split libXmuu from libXmu

BKrev: 41d6c456Kg0GF-pB7EYbYUh24-OHNg

2 files changed, 95 insertions, 2 deletions

diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index ff4eaa0199..8a3568055d 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 = "r27"
+PR = "r28"
 
 ALLOW_EMPTY = 1
 
@@ -19,7 +19,6 @@ gpe-task-base = "\
     rxvt-unicode \
     gtk2-theme-angelistic \
     xst \
-    xprop \
     xhost \
     xrdb \
     gpe-soundserver \
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index e69de29bb2..66b1037380 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -0,0 +1,94 @@
+PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games 
+DESCRIPTION = "Meta-package for GPE Security Testing Image"
+MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
+PR = "r25"
+
+ALLOW_EMPTY = 1
+
+gpe-base-depends = "\
+    diet-x11 \
+    virtual/xserver"
+
+RDEPENDS_gpe-base-depends := "${gpe-base-depends}"
+DEPENDS += " ${gpe-base-depends}"
+
+gpe-task-base = "\
+    bluez-utils-dbus \
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    gtk2-theme-angelistic \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    ttf-bitstream-vera \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    gpe-bootsplash \
+    libgtkstylus \
+    gpe-appmgr \
+    detect-stylus"
+
+RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \
+			   gdk-pixbuf-loader-xpm \
+			   gdk-pixbuf-loader-jpeg \
+			   pango-module-basic-x \
+			   pango-module-basic-fc \
+			   ${gpe-task-base}"
+DEPENDS += " ${gpe-task-base}"
+
+gpe-task-pim = "\
+    figment"
+RDEPENDS_gpe-task-pim := "${gpe-task-pim}"
+DEPENDS += " ${gpe-task-pim}"
+
+gpe-task-settings = "\
+    matchbox-panel-manager \
+    gpe-bluetooth \
+    gpe-beam \
+    gpe-su \
+    gpe-conf \
+    gpe-clock \
+    gpe-mininet \
+    gpe-mixer \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    keylaunch \
+    minilite \
+    xmonobut"
+
+RDEPENDS_gpe-task-settings := "${gpe-task-settings}"
+DEPENDS += " ${gpe-task-settings}"
+
+gpe-task-apps = "\
+    gpe-edit \
+    gpe-calculator \
+    gpe-clock \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    mbmerlin \
+    nmap \
+    ettercap \
+    stunnel \
+    btscanner \
+    curl \
+    dsniff \
+    kismet \
+    prismstumbler \
+    miniclipboard"
+
+RDEPENDS_gpe-task-apps := "${gpe-task-apps}"
+DEPENDS += " ${gpe-task-apps}"
+
+
+DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
+