From 8ff50704bee24b2b8abea22ac2933e641de79a6a Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Fri, 12 Nov 2010 17:13:42 +0200 Subject: [PATCH] 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 Signed-off-by: Kristoffer Ericson --- 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 5ba54dd179..893a5778b2 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 47096da1d1..4e3525a176 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 91a41c9b4f40b9e81eac9ccb47d1db0c5c3420c6..d57171404a181e08cb3086bbf4abbc4bb7942e39 100644 GIT binary patch literal 5082 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 literal 4522 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 -- 2.39.5