dzen2: Modularize dzen-launcher, update recipe.

Moved battery charge status calculation from dzen-launcher to
/usr/share/dzen/scripts/battery.sh, modularizing the process
for various different devices (nanonote, h1940, rx1950 and a
generic target for now).

Modified Makefile for battery.sh. All scripts are now installed
to /usr/share/dzen/scripts.

Bumped PR on dzen2-svn recipe.

Signed-off-by: Alex Ferguson <thoughtmonster@gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>

diff --git a/recipes/dzen2/dzen2_svn.bb b/recipes/dzen2/dzen2_svn.bb
index 5ba54dd..893a577 100644 (file)
--- a/recipes/dzen2/dzen2_svn.bb
+++ b/recipes/dzen2/dzen2_svn.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "dzen is a general purpose messaging, notification and menu program."
 LICENSE = "MIT"
 DEPENDS = "virtual/libx11 libxft"
+RDEPENDS = "ttf-dejavu-sans xrandr"
 
 SRCREV = "271"
 PV = "0.8.5+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://dzen.googlecode.com/svn/;module=trunk;proto=http \
           file://dzen-extras.tar.gz \

diff --git a/recipes/dzen2/files/Makefile b/recipes/dzen2/files/Makefile
index 47096da..4e3525a 100644 (file)
--- a/recipes/dzen2/files/Makefile
+++ b/recipes/dzen2/files/Makefile
@@ -44,8 +44,8 @@ install: all
        @cp -f dzen-launcher ${DESTDIR}${PREFIX}/bin
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen-launcher
        @echo installing scripts to ${DESTDIR}${PREFIX}/share/dzen
-       @mkdir -p ${DESTDIR}${PREFIX}/share/dzen
-       @cp -f scripts/* ${DESTDIR}${PREFIX}/share/dzen
+       @mkdir -p ${DESTDIR}${PREFIX}/share/dzen/scripts
+       @cp -f scripts/* ${DESTDIR}${PREFIX}/share/dzen/scripts
        @echo installing images to ${DESTDIR}${PREFIX}/share/dzen/images
        @mkdir -p ${DESTDIR}${PREFIX}/share/dzen/images
        @cp -f images/* ${DESTDIR}${PREFIX}/share/dzen/images

diff --git a/recipes/dzen2/files/dzen-extras.tar.gz b/recipes/dzen2/files/dzen-extras.tar.gz
index 91a41c9..d571714 100644 (file)
Binary files a/recipes/dzen2/files/dzen-extras.tar.gz and b/recipes/dzen2/files/dzen-extras.tar.gz differ