diff options
author | Ross Burton <ross@openedhand.com> | 2007-05-31 11:52:18 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-05-31 11:52:18 +0000 |
commit | 2add61089dd2619e3224e6384c282bf364cb52b1 (patch) | |
tree | 6a7dfda546c7d9c5d53a2c059f32022eb8d0551b /meta/packages | |
parent | 2b6f26d4a05835daa54b65c2d5d0dc34cbbd86b2 (diff) | |
download | ast2050-yocto-poky-2add61089dd2619e3224e6384c282bf364cb52b1.zip ast2050-yocto-poky-2add61089dd2619e3224e6384c282bf364cb52b1.tar.gz |
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')
3 files changed, 18 insertions, 47 deletions
diff --git a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb b/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb deleted file mode 100644 index f497468..0000000 --- a/meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Matchbox Window Manager Desktop" -LICENSE = "GPL" -DEPENDS = "gtk+ startup-notification" -RDEPENDS = "matchbox-common" -SECTION = "x11/wm" -PV = "2.0+svn${SRCDATE}" -PR = "r1" - -PROVIDES_${PN} = matchbox-desktop -RPROVIDES_${PN} = matchbox-desktop -RREPLACES_${PN} = matchbox-desktop -RCONFLICTS_${PN} = matchbox-desktop - -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" - -EXTRA_OECONF = "--enable-startup-notification" - -S = "${WORKDIR}/${PN}" - -inherit autotools pkgconfig 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 0000000..a48d0e0 --- /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 8e89d9b..f3ceaf4 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/ -} - |