fixes to xmms and fluxbox

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9793 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile
index aca787d..b5d296e 100644 (file)
--- a/XOrg/app/fluxbox/Makefile
+++ b/XOrg/app/fluxbox/Makefile
@@ -63,8 +63,9 @@ define Package/fluxbox/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
        $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
+       $(CP) files/init $(1)/usr/share/fluxbox/
        $(CP) files/menu $(1)/usr/share/fluxbox/
 endef
 

diff --git a/XOrg/app/fluxbox/files/init b/XOrg/app/fluxbox/files/init
new file mode 100644 (file)
index 0000000..74926d5
--- /dev/null
+++ b/XOrg/app/fluxbox/files/init
@@ -0,0 +1,99 @@
+session.screen0.titlebar.left: Stick 
+session.screen0.titlebar.right:        Minimize Maximize Close 
+session.screen0.tab.width:     64
+session.screen0.tab.alignment: Left
+session.screen0.tab.rotatevertical:    True
+session.screen0.tab.placement: TopLeft
+session.screen0.tab.height:    16
+session.screen0.menu.alpha:    158
+session.screen0.tabs.intitlebar:       false
+session.screen0.toolbar.onTop: False
+session.screen0.toolbar.visible:       true
+session.screen0.toolbar.layer: Desktop
+session.screen0.toolbar.height:        0
+session.screen0.toolbar.autoHide:      false
+session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
+session.screen0.toolbar.maxOver:       false
+session.screen0.toolbar.placement:     TopCenter
+session.screen0.toolbar.alpha: 255
+session.screen0.toolbar.widthPercent:  100
+session.screen0.toolbar.onhead:        0
+session.screen0.window.focus.alpha:    255
+session.screen0.window.unfocus.alpha:  34
+session.screen0.iconbar.iconTextPadding:       10l
+session.screen0.iconbar.wheelMode:     Screen
+session.screen0.iconbar.alignment:     Relative
+session.screen0.iconbar.usePixmap:     true
+session.screen0.iconbar.deiconifyMode: Follow
+session.screen0.iconbar.mode:  Workspace
+session.screen0.iconbar.iconWidth:     70
+session.screen0.slit.direction:        Vertical
+session.screen0.slit.autoHide: false
+session.screen0.slit.onTop:    False
+session.screen0.slit.layer:    Dock
+session.screen0.slit.alpha:    255
+session.screen0.slit.maxOver:  false
+session.screen0.slit.placement:        BottomRight
+session.screen0.slit.onhead:   0
+session.screen0.overlay.lineWidth:     1
+session.screen0.overlay.lineStyle:     LineSolid
+session.screen0.overlay.joinStyle:     JoinMiter
+session.screen0.overlay.capStyle:      CapNotLast
+session.screen0.edgeSnapThreshold:     0
+session.screen0.workspaceNames:        one,two,three,
+session.screen0.windowPlacement:       RowSmartPlacement
+session.screen0.windowScrollAction:    
+session.screen0.focusModel:    ClickFocus
+session.screen0.focusLastWindow:       true
+session.screen0.clickRaises:   true
+session.screen0.menuMode:      Delay
+session.screen0.desktopwheeling:       true
+session.screen0.imageDither:   false
+session.screen0.colPlacementDirection: TopToBottom
+session.screen0.rowPlacementDirection: LeftToRight
+session.screen0.resizeMode:    Bottom
+session.screen0.windowMenu:    
+session.screen0.followModel:   Ignore
+session.screen0.decorateTransient:     false
+session.screen0.strftimeFormat:        %a %d %H:%M
+session.screen0.workspacewarping:      true
+session.screen0.menuDelay:     0
+session.screen0.windowScrollReverse:   false
+session.screen0.workspaces:    3
+session.screen0.autoRaise:     false
+session.screen0.sloppywindowgrouping:  true
+session.screen0.reversewheeling:       false
+session.screen0.rootCommand:   ~/.xsession     
+session.screen0.menuDelayClose:        0
+session.screen0.fullMaximization:      false
+session.screen0.tabFocusModel: ClickToTabFocus
+session.screen0.focusNewWindows:       true
+session.screen0.antialias:     true
+session.screen0.showwindowposition:    true
+session.screen0.opaqueMove:    false
+session.titlebar.left: Stick 
+session.titlebar.right:        Minimize Maximize Close 
+session.cacheLife:     5l
+session.ignoreBorder:  false
+session.tabs:  true
+session.doubleClickInterval:   250
+session.tabsAttachArea:        Window
+session.iconbar:       true
+session.imageDither:   True
+session.focusTabMinWidth:      0
+session.modKey:        Mod1
+session.forcePseudoTransparency:       false
+session.autoRaiseDelay:        250
+session.styleFile:     /usr/share/fluxbox/styles/BlueNight
+session.cacheMax:      200l
+session.useMod1:       true
+session.keyFile:       ~/.fluxbox/keys
+session.menuFile:      ~/.fluxbox/menu
+session.tabPadding:    0
+session.groupFile:     ~/.fluxbox/groups
+session.colorsPerChannel:      4
+session.appsFile:      ~/.fluxbox/apps
+session.slitlistFile:  ~/.fluxbox/slitlist
+session.numLayers:     13
+session.opaqueMove:    False
+session.styleOverlay:  ~/.fluxbox/overlay

diff --git a/XOrg/app/xmms/Makefile b/XOrg/app/xmms/Makefile
index 91e2359..c63a769 100644 (file)
--- a/XOrg/app/xmms/Makefile
+++ b/XOrg/app/xmms/Makefile
@@ -58,7 +58,8 @@ define Build/Compile
 endef
 
 define Package/xmms/install
-       $(call pkg_install_files,/usr/bin/xmms /usr/lib/libxmms.so /usr/lib/libxmms.so.1 /usr/lib/libxmms.so.1.3.1 /usr/share/xmms/wmxmms.xpm,$(PKG_INSTALL_DIR),$(1))
+       $(call pkg_install_files,/usr/lib/libxmms.so /usr/lib/libxmms.so.1 /usr/lib/libxmms.so.1.3.1 /usr/share/xmms/wmxmms.xpm,$(PKG_INSTALL_DIR),$(1))
+       $(call pkg_install_bin,/usr/bin/xmms,$(PKG_INSTALL_DIR),$(1))
 endef
 
 $(eval $(call BuildPackage,xmms))