From 5badc4267510b46619fbbe88d0a4acc56f8c4fc5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 3 Jul 2006 15:15:58 +0000 Subject: [PATCH] fluxbox: Split flxubox-gpe in fluxbox and fluxbox-gpe, courtesy hrw & koen --- .../{fluxbox-gpe => fluxbox}/.mtn2git_empty | 0 .../{fluxbox-gpe => fluxbox}/apps.gpe.akita | 0 .../{fluxbox-gpe => fluxbox}/apps.gpe.default | 0 .../fluxbox-gpe-session | 0 .../fluxbox-gpe.session | 0 .../{fluxbox-gpe => fluxbox}/gpe-init.patch | 0 .../style.gpe-default | 0 ...box-gpe_1.0rc.bb => fluxbox_0.99+1.0rc.bb} | 44 ++++++++++--------- 8 files changed, 23 insertions(+), 21 deletions(-) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/.mtn2git_empty (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/apps.gpe.akita (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/apps.gpe.default (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/fluxbox-gpe-session (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/fluxbox-gpe.session (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/gpe-init.patch (100%) rename packages/fluxbox/{fluxbox-gpe => fluxbox}/style.gpe-default (100%) rename packages/fluxbox/{fluxbox-gpe_1.0rc.bb => fluxbox_0.99+1.0rc.bb} (68%) diff --git a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty similarity index 100% rename from packages/fluxbox/fluxbox-gpe/.mtn2git_empty rename to packages/fluxbox/fluxbox/.mtn2git_empty diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox/apps.gpe.akita similarity index 100% rename from packages/fluxbox/fluxbox-gpe/apps.gpe.akita rename to packages/fluxbox/fluxbox/apps.gpe.akita diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default similarity index 100% rename from packages/fluxbox/fluxbox-gpe/apps.gpe.default rename to packages/fluxbox/fluxbox/apps.gpe.default diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session similarity index 100% rename from packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session rename to packages/fluxbox/fluxbox/fluxbox-gpe-session diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session similarity index 100% rename from packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session rename to packages/fluxbox/fluxbox/fluxbox-gpe.session diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch similarity index 100% rename from packages/fluxbox/fluxbox-gpe/gpe-init.patch rename to packages/fluxbox/fluxbox/gpe-init.patch diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default similarity index 100% rename from packages/fluxbox/fluxbox-gpe/style.gpe-default rename to 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 similarity index 68% rename from packages/fluxbox/fluxbox-gpe_1.0rc.bb rename to packages/fluxbox/fluxbox_0.99+1.0rc.bb index 0d962ca6f5..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 " HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" -RCONFLICTS = "fluxbox" +REALPV = "1.0rc" +PR = "r0" ###################################################################################### -PR = "r2" -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} ${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" -- 2.39.5