5 files changed, 20 insertions, 65 deletions
diff --git a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty b/packages/fluxbox/fluxbox-gpe/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty
+++ /dev/null
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
deleted file mode 100644
index 7aca442752..0000000000
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
+++ /dev/null
@@ -1,57 +0,0 @@
-[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
deleted file mode 100644
index d7a0a83f22..0000000000
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe.default
+++ /dev/null
@@ -1,7 +0,0 @@
-[app] (title=Panel 0)
-  [Deco]	{NONE}
-  [Sticky]	{yes}
-[end]
-[app] (title=Panel 1)
-  [Deco]	{NONE}
-[end]
diff --git a/packages/fluxbox/fluxbox/apps.gpe.akita b/packages/fluxbox/fluxbox/apps.gpe.akita
index 7aca442752..3c696fc283 100644
--- a/packages/fluxbox/fluxbox/apps.gpe.akita
+++ b/packages/fluxbox/fluxbox/apps.gpe.akita
@@ -55,3 +55,22 @@
 [app] (gpe-sketchbook)
   [Dimensions]	{471 314}
 [end]
+[app] (gpe-todo)
+  [Dimensions]	{364 344}
+[end]
+[app] (gpe-contacts)
+  [Dimensions]	{327 395}
+  [Position]	(UPPERLEFT)	{134 34}
+[end]
+[app] (gpe-conf)
+  [Dimensions]	{380 400}
+  [Position]	(UPPERLEFT)	{93 34}
+[end]
+[app] (gpe-package)
+  [Dimensions]	{635 440}
+  [Position]	(UPPERLEFT)	{0 0}
+[end]
+[app] (matchbox-panel-manager)
+  [Dimensions]	{431 326}
+  [Position]	(UPPERLEFT)	{85 52}
+[end]
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index cf69b090c4..5cb05d96d5 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -10,7 +10,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
 REALPV = "1.0rc"
-PR = "r1"
+PR = "r2"
 
 ######################################################################################