[oe-commits] Alex Ferguson : dzen2: Modularize dzen-launcher, update recipe.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8ff50704bee24b2b8abea22ac2933e641de79a6a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8ff50704bee24b2b8abea22ac2933e641de79a6a

Author: Alex Ferguson <thoughtmonster at gmail.com>
Date:   Fri Nov 12 17:13:42 2010 +0200

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 at gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson at gmail.com>

---

 recipes/dzen2/dzen2_svn.bb             |    3 ++-
 recipes/dzen2/files/Makefile           |    4 ++--
 recipes/dzen2/files/dzen-extras.tar.gz |  Bin 4522 -> 5082 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/dzen2/dzen2_svn.bb b/recipes/dzen2/dzen2_svn.bb
index 5ba54dd..893a577 100644
--- 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
--- 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
Binary files a/recipes/dzen2/files/dzen-extras.tar.gz and b/recipes/dzen2/files/dzen-extras.tar.gz differ