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

1 files changed, 7 insertions, 27 deletions

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/
-}
-