Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/24 20:51:24+01:00 (none)!koen
fix matchbox 0.9.1 URIs to use 0.9

BKrev: 41f551d9LY_1my6LqVwt6sSQTS6jew

4 files changed, 56 insertions, 1 deletions

diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb
index e69de29bb2..2927ccd08f 100644
--- a/packages/matchbox-common/matchbox-common_0.9.1.bb
+++ b/packages/matchbox-common/matchbox-common_0.9.1.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager common files"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--enable-pda-folders"
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox/vfolders \
+	       ${datadir}/pixmaps"
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index f136eba39e..72bf1ba351 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index e69de29bb2..a96962cccf 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Matchbox Window Manager Panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+SECTION = "x11/wm"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/applications \
+	       ${datadir}/pixmaps"
+
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.1.bb b/packages/matchbox-wm/matchbox-wm_0.9.1.bb
index e69de29bb2..55988fbbf4 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.1.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.1.bb
@@ -0,0 +1,26 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools  pkgconfig
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox \
+	       ${datadir}/themes/blondie/matchbox \
+	       ${datadir}/themes/bluebox/matchbox \
+	       ${datadir}/themes/borillo/matchbox"
+
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --enable-expat"
+
+pkg_postinst() {
+update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/matchbox-session 10
+}
+
+pkg_postrm() {
+update-alternatives --remove x-window-manager /usr/bin/matchbox-session
+}