# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1387412950 -3600
# Node ID f4a081075efd36c0cfdf6c6c9838590a1bdabbbb
# Parent  0d7ccf48c360a3f4321ff10b398500b959bc779d
Up: wbar2 (2.3.4)

diff -r 0d7ccf48c360 -r f4a081075efd wbar2/receipt
--- a/wbar2/receipt	Wed Dec 18 19:09:22 2013 +0000
+++ b/wbar2/receipt	Thu Dec 19 01:29:10 2013 +0100
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="wbar2"
-VERSION="2.2.2"
+VERSION="2.3.4"
 CATEGORY="system-tools"
 SHORT_DESC="Quick launch bar."
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="GPL3"
 SOURCE="wbar"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+TARBALL="$SOURCE-$VERSION.tgz"
 WEB_SITE="http://code.google.com/p/wbar/"
 WGET_URL="http://wbar.googlecode.com/files/$TARBALL"
 CONFIG_FILES="/etc/default/wbar/wbar.cfg"
@@ -28,11 +28,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/usr $install/etc $fs
-	cp -a $stuff/wbar.cfg $fs/etc/default/wbar
-	rm -r $install/usr/share/locale
-	for file in $fs/usr/share/pixmaps/wbar/*; do
-		[ "${file##*/}" = osxbarback.png ] && continue
-		rm -f $file
-	done
+	mkdir -p $fs/usr/share
+	
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/etc $fs/
+	cp -a $stuff/wbar.cfg $fs/etc/wbar.d
+	cp -a $install/usr/share/pixmaps $fs/usr/share
+	cp -a $install/usr/share/wbar $fs/usr/share
 }
diff -r 0d7ccf48c360 -r f4a081075efd wbar2/stuff/wbar.cfg
--- a/wbar2/stuff/wbar.cfg	Wed Dec 18 19:09:22 2013 +0000
+++ b/wbar2/stuff/wbar.cfg	Thu Dec 19 01:29:10 2013 +0100
@@ -1,47 +1,35 @@
-i: /usr/share/pixmaps/wbar/osxbarback.png
-c: wbar --bpress --above-desk --pos bottom
-t: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold/12
+i: /usr/share/pixmaps/wbar/dock.png
+c: wbar --bpress --above-desk --pos bottom --isize 32 --idist 12 --nanim 3 --zoomf 1.8 --jumpf 1.00 --balfa 0 --falfa 100 --nofont
+t: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold/10
 
-i: /usr/share/pixmaps/wbar.png
+i: /usr/share/pixmaps/wbar/wbar.png
 c: wbar-config
-t: Bar configuration
+t: Wbar Configuration
 
-i: /usr/share/pixmaps/alsaplayer.png
-c: /usr/bin/alsaplayer
-t: Audio player
+i: /usr/share/pixmaps/tazpanel.png
+c: tazweb http://tazpanel:82/
+t: SliTaz Panel
 
-i: /usr/share/icons/SliTaz/32x32/mimetypes/audio-x-generic.png
-c: xterm -e alsamixer
-t: Sound mixer
+i: /usr/share/pixmaps/midori.png
+c: midori %u
+t: Web Browser
 
-i: /usr/share/pixmaps/xterm.png
-c: xterm
+i: /usr/share/pixmaps/sakura.png
+c: sakura
 t: Terminal emulator
 
+i: /usr/share/pixmaps/spacefm.png
+c: spacefm
+t: Files manager
+
 i: /usr/share/pixmaps/leafpad.png
 c: leafpad
 t: Text editor
 
-i: /usr/share/pixmaps/lostirc.png
-c: lostirc
-t: IRC client
-
-i: /usr/share/pixmaps/pcmanfm.png
-c: pcmanfm
-t: Files manager
-
-i: /usr/share/pixmaps/tazpkg.png
-c: tazpkgbox
-t: Packages manager
-
-i: /usr/share/pixmaps/lxtask.png
+1i: /usr/share/pixmaps/lxtask.png
 c: lxtask
 t: Task manager
 
-i: /usr/share/pixmaps/transmission.png
-c: transmission
-t: Bittorent client
-
-i: /usr/share/pixmaps/logout.png
-c: desktopbox logout
+i: /usr/share/pixmaps/slitaz-menu.png
+c: tazbox logout
 t: Logout