summaryrefslogtreecommitdiff
path: root/packages/fluxbox
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-07-03 08:45:06 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-03 08:45:06 +0000
commit8894f7cfb20ef9fb84217d5bf1dbfd6f9bfec375 (patch)
treedceb32b51b03fe541acdebc41a1cbeda2a9ea8d4 /packages/fluxbox
parent4e26f686b6c18fe1f57bb20d5edfa81699377ee1 (diff)
parent21dc42547b843538c285d3293ad042425624a61a (diff)
merge of 5672c342d20576efa34f379ef1131d03b578ce6b
and f020c58a9acc8f8db54a7887ff02163ecc5fd3b3
Diffstat (limited to 'packages/fluxbox')
-rw-r--r--packages/fluxbox/fluxbox-gpe/apps.gpe.akita57
-rw-r--r--packages/fluxbox/fluxbox-gpe/apps.gpe.default7
-rw-r--r--packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session14
-rw-r--r--packages/fluxbox/fluxbox-gpe_1.0rc.bb8
4 files changed, 80 insertions, 6 deletions
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
new file mode 100644
index 0000000000..7aca442752
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
@@ -0,0 +1,57 @@
+[app] (title=Panel 0)
+ [Deco] {NONE}
+ [Sticky] {yes}
+[end]
+[app] (title=Panel 1)
+ [Deco] {NONE}
+[end]
+[app] (title=rxvt)
+ [Dimensions] {635 440}
+[end]
+[app] (title=x-terminal-emulator)
+ [Dimensions] {635 440}
+[end]
+[app] (abiword)
+ [Dimensions] {635 440}
+ [Sticky] {no}
+[end]
+[app] (gpe-filemanager)
+ [Dimensions] {635 440}
+ [Sticky] {yes}
+[end]
+[app] (gpe-info)
+ [Dimensions] {424 336}
+[end]
+[app] (gpe-edit)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-calculator)
+ [Dimensions] {266 321}
+[end]
+[app] (main)
+ [Dimensions] {635 440}
+[end]
+[app] (Gnumeric)
+ [Dimensions] {635 440}
+[end]
+[app] (gpdf)
+ [Dimensions] {635 440}
+[end]
+[app] (main_window)
+ [Dimensions] {635 440}
+[end]
+[app] (gaim)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-calendar)
+ [Dimensions] {380 343}
+[end]
+[app] (gpe-mini-browser)
+ [Dimensions] {635 440}
+[end]
+[app] (figment)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-sketchbook)
+ [Dimensions] {471 314}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
new file mode 100644
index 0000000000..d7a0a83f22
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
@@ -0,0 +1,7 @@
+[app] (title=Panel 0)
+ [Deco] {NONE}
+ [Sticky] {yes}
+[end]
+[app] (title=Panel 1)
+ [Deco] {NONE}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
index ca0afea35d..f6e03ede7e 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
@@ -4,10 +4,20 @@
#
# Install "apps" file with defaults for GPE usage
-if test -e /usr/share/fluxbox/apps.gpe
+
+MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
+
+case $MACHINE in
+*Akita | *Spitz | *Borzoi | *Terrier)
+ APPS="apps.gpe.akita";;
+*)
+ APPS="apps.gpe.default";;
+esac
+
+if test -e /usr/share/fluxbox/$APPS
then
mkdir -p $HOME/.fluxbox
- test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/apps.gpe $HOME/.fluxbox/apps
+ test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps
fi
diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
index 50c5d6ce1d..0d962ca6f5 100644
--- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb
+++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
@@ -13,14 +13,14 @@ RCONFLICTS = "fluxbox"
######################################################################################
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/fluxbox-${PV}"
######################################################################################
SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \
file://gpe-init.patch;patch=1\
- file://apps.gpe \
+ file://apps.gpe.* \
file://style.gpe-default \
file://fluxbox-gpe-session \
file://fluxbox-gpe.session"
@@ -37,7 +37,7 @@ FILES_${PN} = "/usr/bin \
/usr/share/fluxbox/init \
/usr/share/fluxbox/keys \
/usr/share/fluxbox/menu \
- /usr/share/fluxbox/apps.gpe \
+ /usr/share/fluxbox/apps.gpe* \
/usr/share/fluxbox/session \
/usr/share/fluxbox/styles/gpe-default"
@@ -59,7 +59,7 @@ do_install_append() {
install -d ${D}/usr/share/fluxbox
install -d ${D}/usr/share/fluxbox/styles
- install -m 0644 ${WORKDIR}/apps.gpe ${D}/usr/share/fluxbox
+ install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin