summaryrefslogtreecommitdiff
path: root/meta/packages/matchbox-desktop
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-05-31 11:52:18 +0000
committerRoss Burton <ross@openedhand.com>2007-05-31 11:52:18 +0000
commit2add61089dd2619e3224e6384c282bf364cb52b1 (patch)
tree6a7dfda546c7d9c5d53a2c059f32022eb8d0551b /meta/packages/matchbox-desktop
parent2b6f26d4a05835daa54b65c2d5d0dc34cbbd86b2 (diff)
downloadopenembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.tar.gz
openembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.tar.bz2
openembedded-core-2add61089dd2619e3224e6384c282bf364cb52b1.zip
Clean up matchbox-desktop/matchbox-desktop-2 so that everything is called matchbox-desktop
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1834 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/matchbox-desktop')
-rw-r--r--meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb11
-rw-r--r--meta/packages/matchbox-desktop/matchbox-desktop_svn.bb34
2 files changed, 18 insertions, 27 deletions
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb
new file mode 100644
index 0000000000..a48d0e073c
--- /dev/null
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Matchbox Window Manager Desktop"
+LICENSE = "GPL"
+DEPENDS = "gtk+ startup-notification"
+RDEPENDS = "matchbox-common"
+SECTION = "x11/wm"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2"
+
+EXTRA_OECONF = "--enable-startup-notification"
+
+inherit autotools pkgconfig
diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 8e89d9b9ff..f3ceaf48bd 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -1,35 +1,15 @@
DESCRIPTION = "Matchbox Window Manager Desktop"
LICENSE = "GPL"
-DEPENDS = "libmatchbox startup-notification"
+DEPENDS = "gtk+ startup-notification"
+RDEPENDS = "matchbox-common"
SECTION = "x11/wm"
-PV = "0.9.1+svn${SRCDATE}"
-DEFAULT_PREFERENCE = "-1"
+PV = "2.0+svn${SRCDATE}"
+PR = "r1"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http"
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
+EXTRA_OECONF = "--enable-startup-notification"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/${PN}-2"
inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
- ${datadir}/applications \
- ${libdir}/matchbox/desktop/*.so \
- ${datadir}/matchbox-desktop \
- ${datadir}/pixmaps \
- ${sysconfdir}/matchbox"
-
-FILES_${PN}-dev += "${libdir}/matchbox-desktop \
- ${includedir}/matchbox-desktop \
- ${libdir}/matchbox/desktop/*.*a \
- ${datadir}/matchbox/desktop/modules/*a"
-
-FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
-
-
-do_stage() {
- install -d ${STAGING_INCDIR}/matchbox-desktop/
- install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/matchbox-desktop/
-}
-