fluxbox: add 1.1.1, remove old versions
authorKoen Kooi <koen@openembedded.org>
Sun, 29 Mar 2009 11:13:53 +0000 (13:13 +0200)
committerKoen Kooi <koen@openembedded.org>
Sun, 29 Mar 2009 11:13:53 +0000 (13:13 +0200)
15 files changed:
conf/checksums.ini
recipes/fluxbox/fluxbox/apps.gpe.akita [deleted file]
recipes/fluxbox/fluxbox/apps.gpe.default [deleted file]
recipes/fluxbox/fluxbox/fluxbox-gpe-session [deleted file]
recipes/fluxbox/fluxbox/fluxbox-gpe.session [deleted file]
recipes/fluxbox/fluxbox/fluxbox-wm [new file with mode: 0644]
recipes/fluxbox/fluxbox/gpe-init.patch [deleted file]
recipes/fluxbox/fluxbox/gpe-logout.fluxbox [deleted file]
recipes/fluxbox/fluxbox/keylaunchrc.fluxbox [deleted file]
recipes/fluxbox/fluxbox/keys.akita [deleted file]
recipes/fluxbox/fluxbox/keys.default [deleted file]
recipes/fluxbox/fluxbox/style.gpe-default [deleted file]
recipes/fluxbox/fluxbox_0.99+1.0rc.bb [deleted file]
recipes/fluxbox/fluxbox_1.1.1.bb [new file with mode: 0644]
recipes/fluxbox/fluxbox_svn.bb [deleted file]

index 29fac5e..7d0fd51 100644 (file)
@@ -6022,6 +6022,10 @@ sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16
 md5=530801fe835fd9a680457e443eb95578
 sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32
 
+[http://downloads.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.gz]
+md5=1f389177e17cd1e8dbed07c80812961f
+sha256=98afcaae49cd3cb1ca5fa32b379d630ec88a75e64cb8472a1023db1d1c35c12a
+
 [http://downloads.sourceforge.net/fluxbox/fluxbox-1.0rc.tar.gz]
 md5=2575d0b605bcacc406c5b8f89fb0d3c5
 sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
@@ -6030,6 +6034,10 @@ sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
 md5=2575d0b605bcacc406c5b8f89fb0d3c5
 sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
 
+[http://downloads.sourceforge.net/fluxbox/fluxbox-1.1.1.tar.gz]
+md5=e0be927617be4ffc1ddc79513f4eb0f9
+sha256=7306ee55a8e95a4d07bee339ffb3be2d88ef8cc08b86edd6c63d7b28f559ec88
+
 [http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz]
 md5=4bae0e5feeb8cbf4cfcb950301e9509d
 sha256=60a55ba4a57b5ed430c62662283e9cb6de685c8497173f1f2065f684b2aceabd
@@ -15874,6 +15882,10 @@ sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5
 md5=dccaddeb49d7def8a19cf497cb7eabf8
 sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d
 
+[http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
+md5=d50f0a9683dee60685bcd48e04970949
+sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
 md5=24f6c176246300b66c036de65fed0565
 sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
diff --git a/recipes/fluxbox/fluxbox/apps.gpe.akita b/recipes/fluxbox/fluxbox/apps.gpe.akita
deleted file mode 100644 (file)
index 3c696fc..0000000
+++ /dev/null
@@ -1,76 +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]
-[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/recipes/fluxbox/fluxbox/apps.gpe.default b/recipes/fluxbox/fluxbox/apps.gpe.default
deleted file mode 100644 (file)
index d7a0a83..0000000
+++ /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/recipes/fluxbox/fluxbox/fluxbox-gpe-session b/recipes/fluxbox/fluxbox/fluxbox-gpe-session
deleted file mode 100644 (file)
index 520914a..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# Session script for fluxbox-gpe, heavily based on matchbox's session script
-#
-
-# Install "apps" file with defaults for GPE usage
-
-MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
-
-case $MACHINE in
-*Akita | *Spitz | *Borzoi | *Terrier)  
-       APPS="apps.gpe.akita"
-       KEYS="keys.akita";;
-*)     
-       APPS="apps.gpe.default"
-       KEYS="keys.default";;
-esac
-
-if test -e /usr/share/fluxbox/$APPS
-then
-       mkdir -p $HOME/.fluxbox
-       test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps
-fi
-
-if test -e /usr/share/fluxbox/$KEYS
-then
-       mkdir -p $HOME/.fluxbox
-       test -e $HOME/.fluxbox/keys || cp /usr/share/fluxbox/$KEYS $HOME/.fluxbox/keys
-fi
-
-
-if [ -e $HOME/.fluxbox/session ]
-then
-exec $HOME/.fluxbox/session
-fi
-
-if [ -e /usr/share/fluxbox/session ]
-then
-exec /usr/share/fluxbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-
-matchbox-desktop &
-matchbox-panel  --orientation south -no-flip &
-sleep 5
-exec startfluxbox $@  
diff --git a/recipes/fluxbox/fluxbox/fluxbox-gpe.session b/recipes/fluxbox/fluxbox/fluxbox-gpe.session
deleted file mode 100644 (file)
index 16b7a27..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1`
-
-matchbox-desktop &
-matchbox-panel  --orientation south --no-flip&
-sleep 5
-exec startfluxbox $@            
-
diff --git a/recipes/fluxbox/fluxbox/fluxbox-wm b/recipes/fluxbox/fluxbox/fluxbox-wm
new file mode 100644 (file)
index 0000000..ced02ff
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -e $HOME/.fluxbox/session ] ; then
+       exec $HOME/.fluxbox/session
+fi
+
+if [ -e /usr/share/fluxbox/session  ] ; then
+       exec /usr/share/fluxbox/session
+fi
+
+# Fall-through
+exec startfluxbox $@  
diff --git a/recipes/fluxbox/fluxbox/gpe-init.patch b/recipes/fluxbox/fluxbox/gpe-init.patch
deleted file mode 100644 (file)
index c983692..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
---- fluxbox-1.0rc/data/init.in.orig    2006-07-02 20:45:39.119045500 +0200
-+++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200
-@@ -1,35 +1,95 @@
-+session.screen0.slit.onTop:   False
- session.screen0.slit.placement:       BottomRight
-+session.screen0.slit.alpha:   255
-+session.screen0.slit.onhead:  0
- session.screen0.slit.direction:       Vertical
--session.screen0.slit.onTop:   False
--session.screen0.slit.autoHide:        False
--session.screen0.tab.placement:        Top
-+session.screen0.slit.layer:   Dock
-+session.screen0.slit.maxOver: false
-+session.screen0.slit.autoHide:        false
-+session.screen0.menu.alpha:   255
-+session.screen0.iconbar.iconTextPadding:      10l
-+session.screen0.iconbar.alignment:    Left
-+session.screen0.iconbar.wheelMode:    Screen
-+session.screen0.iconbar.mode: Workspace
-+session.screen0.iconbar.deiconifyMode:        Follow
-+session.screen0.iconbar.iconWidth:    70
-+session.screen0.iconbar.usePixmap:    true
-+session.screen0.window.focus.alpha:   255
-+session.screen0.window.unfocus.alpha: 255
-+session.screen0.tab.height:   16
- session.screen0.tab.alignment:        Left
- session.screen0.tab.rotatevertical:   True
--session.screen0.toolbar.onTop:        False
--session.screen0.toolbar.autoHide:     False
--session.screen0.toolbar.placement:    BottomCenter
--session.screen0.toolbar.widthPercent: 66
--session.screen0.workspaceNames:       one,two,three,four
-+session.screen0.tab.placement:        TopLeft
-+session.screen0.tab.width:    64
-+session.screen0.tabs.intitlebar:      true
-+session.screen0.titlebar.left:        Stick 
-+session.screen0.titlebar.right:       Minimize Maximize Close 
-+session.screen0.toolbar.tools:        workspacename, prevworkspace, nextworkspace, iconbar, clock
-+session.screen0.toolbar.visible:      true
-+session.screen0.toolbar.layer:        Top
-+session.screen0.toolbar.placement:    TopCenter
-+session.screen0.toolbar.onhead:       0
-+session.screen0.toolbar.widthPercent: 69
-+session.screen0.toolbar.onTop:        true
-+session.screen0.toolbar.height:       0
-+session.screen0.toolbar.alpha:        254
-+session.screen0.toolbar.autoHide:     false
-+session.screen0.toolbar.maxOver:      true
-+session.screen0.overlay.lineWidth:    1
-+session.screen0.overlay.lineStyle:    LineSolid
-+session.screen0.overlay.joinStyle:    JoinMiter
-+session.screen0.overlay.capStyle:     CapNotLast
-+session.screen0.autoRaise:    false
- session.screen0.strftimeFormat:       %k:%M
--session.screen0.focusNewWindows:      True
--session.screen0.focusModel:   ClickToFocus
--session.screen0.fullMaximization:     False
-+session.screen0.clickRaises:  true
-+session.screen0.imageDither:  false
-+session.screen0.workspaces:   4
-+session.screen0.menuDelay:    0
-+session.screen0.focusNewWindows:      true
-+session.screen0.workspaceNames:       one,two,three,four,
- session.screen0.edgeSnapThreshold:    0
-+session.screen0.menuDelayClose:       0
-+session.screen0.windowScrollReverse:  false
- session.screen0.rowPlacementDirection:        LeftToRight
--session.screen0.workspaces:   4
--session.screen0.focusLastWindow:      True
-+session.screen0.followModel:  Ignore
-+session.screen0.windowMenu:   
-+session.screen0.reversewheeling:      false
-+session.screen0.windowScrollAction:   
-+session.screen0.sloppywindowgrouping: true
-+session.screen0.resizeMode:   Bottom
- session.screen0.colPlacementDirection:        TopToBottom
-+session.screen0.desktopwheeling:      true
-+session.screen0.tabFocusModel:        ClickToTabFocus
-+session.screen0.antialias:    false
-+session.screen0.focusLastWindow:      true
- session.screen0.windowPlacement:      RowSmartPlacement
--session.screen0.tab.width:    64
--session.screen0.tab.height:   16
--session.screen0.showwindowposition: true
--session.opaqueMove:   False
--session.autoRaiseDelay:       250
-+session.screen0.focusModel:   ClickFocus
-+session.screen0.opaqueMove:   false
-+session.screen0.workspacewarping:     true
-+session.screen0.menuMode:     Delay
-+session.screen0.decorateTransient:    false
-+session.screen0.showwindowposition:   true
-+session.screen0.rootCommand:  
-+session.screen0.fullMaximization:     false
-+session.focusTabMinWidth:     0
- session.menuFile:     ~/.fluxbox/menu
--session.cacheLife:    5
--session.styleFile:    @default_style@
--session.keyFile: ~/.fluxbox/keys
-+session.imageDither:  True
- session.colorsPerChannel:     4
-+session.tabPadding:   0
-+session.styleFile:    /usr/share/fluxbox/styles/gpe-default
-+session.cacheMax:     200l
-+session.autoRaiseDelay:       250
- session.doubleClickInterval:  250
--session.cacheMax:     200
--session.imageDither:  True
-+session.tabsAttachArea:       Window
-+session.numLayers:    13
-+session.keyFile:      ~/.fluxbox/keys
-+session.ignoreBorder: false
-+session.appsFile:     ~/.fluxbox/apps
-+session.tabs: false
-+session.useMod1:      true
-+session.slitlistFile: ~/.fluxbox/slitlist
-+session.forcePseudoTransparency:      false
-+session.opaqueMove:   False
-+session.groupFile:    ~/.fluxbox/groups
-+session.cacheLife:    5l
-+session.styleOverlay: ~/.fluxbox/overlay
diff --git a/recipes/fluxbox/fluxbox/gpe-logout.fluxbox b/recipes/fluxbox/fluxbox/gpe-logout.fluxbox
deleted file mode 100644 (file)
index 29a6ab6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-gpe-question --icon /usr/share/pixmaps/gpe-logout.png --question "<span weight='bold' size='larger'>Are you sure you want to log out?</span> 
-
-Unsaved data from applications will be lost." --buttons !gtk-cancel "ok:Log out"
-
-# check for button number returned by gpe-question:
-if [ $? -eq 1 ]; then
-    echo "Logout.";
-    killall fluxbox
-fi
-# hack to run on simpad too
-    killall metacity; 
-else
-    echo "Logout cancelled.";
-fi
-
diff --git a/recipes/fluxbox/fluxbox/keylaunchrc.fluxbox b/recipes/fluxbox/fluxbox/keylaunchrc.fluxbox
deleted file mode 100644 (file)
index 921fa9f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-key=....F9:-:gpe-calendar
-key=....F10:-:gpe-contacts
-key=....F13:-:sylpheed
-#key=....F12:-:~matchbox-remote -next
-#key=...*F12:-:~matchbox-remote -desktop
-#key=....F11:-:~matchbox-remote -menu
-#key=...*1:-:~zoom out
-#key=...*2:-:~zoom in
-key=...*3:-:~display-brightness.sh down 
-key=...*4:-:~display-brightness.sh up 
-                                                                                
-# LCD Softkeys                                                                  
-# Please note that the space _between_ two softkeys can be used, too ;)         
-key=....F20:-:~matchbox-remote -next
-key=....F21:-:~matchbox-remote -desktop
-key=....F22:-:~matchbox-remote -prev
-key=....F23:-:sylpheed                                                          
-#key=....F24:-:                                                                  
-key=....F25:-:gpe-contacts                                                      
-#key=....F26:-:                                                                  
-key=....F27:-:gpe-calendar                                                      
-#key=....F28:-:                                                                 
-key=....F29:-:gpe-mini-browser                                                                 
-#key=....F30:-:                                                                 
-
-# VT changing
-key=...*Left:-:~chvt 1
-key=...*Right:-:~chvt 3
diff --git a/recipes/fluxbox/fluxbox/keys.akita b/recipes/fluxbox/fluxbox/keys.akita
deleted file mode 100644 (file)
index ec84632..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Mod1 Tab :NextWindow
-Mod1 Shift Tab :PrevWindow
-F12 :NextWindow 2
-F11 :ExecCommand matchbox-remote -menu
-Mod4 F11 :RootMenu
-Mod4 F12 :Minimize
-Mod1 r :Reconfigure
diff --git a/recipes/fluxbox/fluxbox/keys.default b/recipes/fluxbox/fluxbox/keys.default
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/recipes/fluxbox/fluxbox/style.gpe-default b/recipes/fluxbox/fluxbox/style.gpe-default
deleted file mode 100644 (file)
index f94aaf7..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-! meta
-! (c) joel carlbark 2003
-! please dont turn on aa with this style
-! make sure you have the font 'glisp' (or similar).
-
-toolbar:                             flat gradient vertical
-toolbar.color:                       #849ec6
-toolbar.colorTo:                     #526d8c
-
-toolbar.button:                      parentrelative
-toolbar.button.picColor:             #d6d7e7
-
-toolbar.button.pressed:              sunken solid
-toolbar.button.pressed.color:        #526d8c
-toolbar.button.pressed.picColor:     #000000
-
-! clock
-toolbar.clock:                       parentrelative
-toolbar.clock.textColor:             white
-
-! shows workspace nr
-toolbar.label:                       parentrelative
-toolbar.label.textColor:             white
-
-! current active window / toolbar
-toolbar.windowLabel:                 parentrelative
-toolbar.windowLabel.textColor:       white
-
-! menu ---------
-menu.title:                          flat gradient vertical
-menu.title.color:                    #849ec6
-menu.title.colorTo:                  #526d8c
-menu.title.textColor:                #d6d7e7
-
-menu.frame:                          flat gradient vertical
-menu.frame.color:                    #efefef
-menu.frame.colorTo:                  #c6c3c6
-menu.frame.textColor:                black
-
-menu.hilite:                         flat solid
-menu.hilite.color:                   #849ec6
-menu.hilite.textColor:               white
-
-menu.bullet:                         triangle
-menu.bullet.position:                right
-
-! window --------------
-window.title.focus:                  flat gradient vertical
-window.title.focus.color:            #849ec6
-window.title.focus.colorTo:          #526d8c
-
-window.label.focus:                  parentrelative
-window.label.focus.textColor:        white
-
-window.button.focus:                 flat gradient vertical
-window.button.focus.color:           #849ec6
-window.button.focus.colorTo:         #526d8c
-window.button.focus.picColor:        #d6d7e7
-
-window.button.pressed:               sunken solid
-window.button.pressed.color:         #405060
-window.button.pressed.picColor:      #000000
-
-window.handle.focus:                 flat gradient vertical
-window.handle.focus.color:           #efefef
-window.handle.focus.colorTo:         #c6c3c6
-
-window.grip.focus:                   flat gradient vertical
-window.grip.focus.color:             #efefef
-window.grip.focus.colorTo:           #c6c3c6
-
-window.frame.focus:                  flat solid
-window.frame.focus.color:            white
-
-! unfocused
-window.title.unfocus:                flat gradient vertical
-window.title.unfocus.color:          #efefef
-window.title.unfocus.colorTo:        #c6c3c6
-
-window.label.unfocus:                parentrelative
-window.label.unfocus.textColor:      #949694
-
-window.handle.unfocus:               flat gradient vertical
-window.handle.unfocus.color:         #efefef
-window.handle.unfocus.colorTo:       #c6c3c6
-
-window.grip.unfocus:                 flat gradient vertical
-window.grip.unfocus.color:           #efefef
-window.grip.unfocus.colorTo:         #c6c3c6
-
-window.frame.unfocus:                flat solid
-window.frame.unfocus.color:          white
-
-window.button.unfocus:               flat gradient vertical
-window.button.unfocus.color:         #efefef
-window.button.unfocus.colorTo:       #c6c3c6
-window.button.unfocus.picColor:      #949694
-
-! tabs ------
-window.tab.justify:                  left
-
-window.tab.label.focus:              flat gradient vertical
-window.tab.label.focus.color:        #849ec6
-window.tab.label.focus.colorTo:      #526d8c
-window.tab.label.focus.textColor:    #d6d7e7
-
-window.tab.label.unfocus:            flat gradient vertical
-window.tab.label.unfocus.color:      #efefef
-window.tab.label.unfocus.colorTo:    #c6c3c6
-window.tab.label.unfocus.textColor:  #949694
-
-window.tab.borderWidth:              1
-window.tab.borderColor:              #949694
-! -------
-
-toolbar.justify:                     left
-window.justify:                      center
-menu.title.justify:                  center
-menu.frame.justify:                  left
-
-borderColor:                         #000000
-borderWidth:                         1
-bevelWidth:                          1
-frameWidth:                          1
-handleWidth:                         4
-
-background: flat
-background.color: #d6d7e7
-
-#*font:                               Vera-4
-#toolbar.font:                      Vera-4
-
-toolbar*.font:                        Vera-6
-window.font:                         Vera-6
-menu.title.font:                     Vera-7
-menu.frame.font:                     Vera-7
-
diff --git a/recipes/fluxbox/fluxbox_0.99+1.0rc.bb b/recipes/fluxbox/fluxbox_0.99+1.0rc.bb
deleted file mode 100644 (file)
index d3bfda7..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-
-DESCRIPTION = "The Fluxbox WindowManager"
-HOMEPAGE = "http://fluxbox.sourceforge.net"
-LICENSE = "MIT"
-
-REALPV = "1.0rc"
-
-PV = "0.99+${REALPV}"
-PR = "r1"
-PE = "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://keys.* \
-          file://keylaunchrc.fluxbox \
-          file://gpe-logout.fluxbox"
-
-S = "${WORKDIR}/fluxbox-${REALPV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-xmb \
-               "
-
-do_install_append() {
-       install -d ${D}${bindir}
-       install -d ${D}${datadir}/fluxbox
-       install -d ${D}${datadir}/fluxbox/styles
-       install -d ${D}/etc
-
-       install -m 0644 ${WORKDIR}/apps.gpe.* ${D}${datadir}/fluxbox
-       install -m 0644 ${WORKDIR}/keys.* ${D}${datadir}/fluxbox
-       install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}${datadir}/fluxbox/session
-       install -m 0644 ${WORKDIR}/style.gpe-default ${D}${datadir}/fluxbox/styles/gpe-default
-       install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}${bindir}
-       install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}${bindir}
-       install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
-}
-
-PACKAGES = "${PN}-dbg ${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} = "${bindir} \
-              ${datadir}/fluxbox/init \
-              ${datadir}/fluxbox/keys \
-              ${datadir}/fluxbox/menu "
-
-FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
-                  ${datadir}/fluxbox/keys.* \
-                  ${bindir}/gpe-logout.fluxbox \
-                  ${sysconfdir}/keylaunchrc.fluxbox \
-                  ${datadir}/fluxbox/styles/gpe-default \
-                  ${datadir}/fluxbox/session \
-                  ${bindir}/fluxbox-gpe-session"
-
-FILES_${PN}-styles = "${datadir}/fluxbox/styles"
-
-FILES_${PN}-doc = "${datadir}/man"
-
-
-pkg_postinst_${PN}-gpe() {
-       update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/fluxbox-gpe-session 15
-       update-alternatives --install ${bindir}/gpe-logout gpe-logout ${bindir}/gpe-logout.fluxbox  15
-       update-alternatives --install ${sysconfdir}keylaunchrc keylaunchrc ${sysconfdir}keylaunchrc.fluxbox 15
-}
-
-pkg_postrm_${PN}-gpe() {
-       update-alternatives --remove x-window-manager ${bindir}/fluxbox-gpe-session
-       update-alternatives --remove gpe-logout ${bindir}/gpe-logout.fluxbox
-       update-alternatives --remove keylaunchrc ${sysconfdir}keylaunchrc.fluxbox
-}
diff --git a/recipes/fluxbox/fluxbox_1.1.1.bb b/recipes/fluxbox/fluxbox_1.1.1.bb
new file mode 100644 (file)
index 0000000..406974b
--- /dev/null
@@ -0,0 +1,28 @@
+DESCRIPTION = "The Fluxbox Windowmanager"
+HOMEPAGE = "http://www.fluxbox.org"
+LICENSE = "MIT"
+DEPENDS = "fontconfig virtual/libx11"
+
+PE = "1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${PV}.tar.gz \
+           file://fluxbox-wm \
+          "
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "--disable-xmb \
+                "
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/fluxbox-wm ${D}${bindir}
+}
+
+FILES_${PN} += "${datadir}/fluxbox/"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/fluxbox-wm"
+ALTERNATIVE_LINK = "x-window-manager"
+ALTERNATIVE_PRIORITY = "20"
+
diff --git a/recipes/fluxbox/fluxbox_svn.bb b/recipes/fluxbox/fluxbox_svn.bb
deleted file mode 100644 (file)
index 4bef6d8..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-
-DESCRIPTION = "The Fluxbox WindowManager"
-HOMEPAGE = "http://fluxbox.sourceforge.net"
-LICENSE = "MIT"
-
-PV = "0.99+svn${SRCDATE}"
-PR = "r1"
-PE = "1" 
-
-SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
-          file://apps.gpe.* \
-          file://style.gpe-default \
-          file://fluxbox-gpe-session \
-          file://fluxbox-gpe.session \
-          file://keys.* \
-          file://keylaunchrc.fluxbox \
-          file://gpe-logout.fluxbox"
-
-S = "${WORKDIR}/trunk"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-xmb \
-               "
-
-do_install_append() {
-       install -d ${D}${bindir}
-       install -d ${D}${datadir}/fluxbox
-       install -d ${D}${datadir}/fluxbox/styles
-       install -d ${D}/etc
-
-       install -m 0644 ${WORKDIR}/apps.gpe.* ${D}${datadir}/fluxbox
-       install -m 0644 ${WORKDIR}/keys.* ${D}${datadir}/fluxbox
-       install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}${datadir}/fluxbox/session
-       install -m 0644 ${WORKDIR}/style.gpe-default ${D}${datadir}/fluxbox/styles/gpe-default
-       install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}${bindir}
-       install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}${bindir}
-       install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
-}
-
-PACKAGES = "${PN}-dbg ${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} = "${bindir} \
-              ${datadir}/fluxbox/init \
-              ${datadir}/fluxbox/keys \
-              ${datadir}/fluxbox/menu "
-
-FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
-                  ${datadir}/fluxbox/keys.* \
-                  ${bindir}/gpe-logout.fluxbox \
-                  ${sysconfdir}keylaunchrc.fluxbox \
-                  ${datadir}/fluxbox/styles/gpe-default \
-                  ${datadir}/fluxbox/session \
-                  ${bindir}/fluxbox-gpe-session"
-
-FILES_${PN}-styles = "${datadir}/fluxbox/styles"
-
-FILES_${PN}-doc = "${datadir}/man"
-
-
-pkg_postinst_${PN}-gpe() {
-       update-alternatives --install ${bindir}/x-window-manager x-window-manager ${bindir}/fluxbox-gpe-session 15
-       update-alternatives --install ${bindir}/gpe-logout gpe-logout ${bindir}/gpe-logout.fluxbox  15
-       update-alternatives --install ${sysconfdir}keylaunchrc keylaunchrc ${sysconfdir}keylaunchrc.fluxbox 15
-}
-
-pkg_postrm_${PN}-gpe() {
-       update-alternatives --remove x-window-manager ${bindir}/fluxbox-gpe-session
-       update-alternatives --remove gpe-logout ${bindir}/gpe-logout.fluxbox
-       update-alternatives --remove keylaunchrc ${sysconfdir}keylaunchrc.fluxbox
-}