merge of 5f35d986fdda87fb19898bc6150d8325c737273f

     and e97331a2b823abbbc0aa40e32d3ce1f542575042

8 files changed, 30 insertions, 21 deletions

diff --git a/packages/fluxbox/fluxbox/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fluxbox/fluxbox/.mtn2git_empty
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox/apps.gpe.akita
index 7aca442752..7aca442752 100644
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe
+++ b/packages/fluxbox/fluxbox/apps.gpe.akita
diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default
new file mode 100644
index 0000000000..d7a0a83f22
--- /dev/null
+++ b/packages/fluxbox/fluxbox/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/fluxbox-gpe-session
index f6e03ede7e..f6e03ede7e 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session
index 16b7a2703a..16b7a2703a 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session
+++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session
diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch
index c9836923d8..c9836923d8 100644
--- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch
+++ b/packages/fluxbox/fluxbox/gpe-init.patch
diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default
index f94aaf7cdd..f94aaf7cdd 100644
--- a/packages/fluxbox/fluxbox-gpe/style.gpe-default
+++ b/packages/fluxbox/fluxbox/style.gpe-default
diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 9cf8da0217..a01d02af89 100644
--- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -5,47 +5,53 @@
 # Filename: fluxbox-gpe_1.0rc.bb
 # Date: 01-Jul-06
 
-DESCRIPTION = "The Fluxbox WindowManager for use with GPE"
+DESCRIPTION = "The Fluxbox WindowManager"
 MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
 HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
-RCONFLICTS = "fluxbox"
+REALPV = "1.0rc"
+PR = "r0"
 
 ######################################################################################
 
-PR = "r3"
-S = "${WORKDIR}/fluxbox-${PV}"
+S = "${WORKDIR}/fluxbox-${REALPV}"
 
 ######################################################################################
 
-SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \
-	   file://gpe-init.patch;patch=1\
+SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
+	   file://gpe-init.patch;patch=1 \
 	   file://apps.gpe.* \
 	   file://style.gpe-default \
 	   file://fluxbox-gpe-session \
-	   file://fluxbox-gpe.session" 
+	   file://fluxbox-gpe.session"
 
 ######################################################################################
 
-PACKAGES += "${PN}-styles"
+PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
 
 DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
+DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
+RDEPENDS_${PN}-gpe = "${PN}"
 
 ######################################################################################
 
 FILES_${PN} = "/usr/bin \
 	       /usr/share/fluxbox/init \
 	       /usr/share/fluxbox/keys \
-	       /usr/share/fluxbox/menu \
-	       /usr/share/fluxbox/apps.gpe* \
-	       /usr/share/fluxbox/session \
-	       /usr/share/fluxbox/styles/gpe-default"
+	       /usr/share/fluxbox/menu "
+
+FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
+		   /usr/share/fluxbox/styles/gpe-default \
+		   /usr/share/fluxbox/session \
+		   /usr/bin/fluxbox-gpe-session"
 
 FILES_${PN}-styles = "/usr/share/fluxbox/styles"
 
+FILES_${PN}-doc = "/usr/share/man"
+
 ######################################################################################
 
-inherit autotools
+inherit autotools update-alternatives
 
 ######################################################################################
 
@@ -67,11 +73,7 @@ do_install_append() {
 
 ######################################################################################
 
-pkg_postinst_${PN}() {	
-	update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
-}
-
-pkg_postrm_${PN}() {	
-	update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
-}
-
+ALTERNATIVE_PATH = "${bindir}/fluxbox-gpe-session"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "15"