mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-27 03:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up matchbox-desktop/matchbox-desktop-2 so that everything is called matchbox-desktop

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1834 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-05-31 11:52:18 +00:00
parent 2b6f26d4a0
commit 2add61089d
4 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/conf/distro/poky.conf
View File

@@ -60,7 +60,6 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
PREFERRED_PROVIDER_matchbox-desktop ?= "matchbox-desktop-2"
PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
@@ -80,8 +79,7 @@ SRCDATE_ipkg-utils ?= "20050930"
SRCDATE_ipkg-link ?= "20050930"
SRCDATE_matchbox-common ?= "20070417"
SRCDATE_matchbox-config-gtk ?= "20070417"
SRCDATE_matchbox-desktop ?= "20060612"
SRCDATE_matchbox-desktop-2 ?= "20070531"
SRCDATE_matchbox-desktop ?= "20070531"
SRCDATE_matchbox-keyboard ?= "20070529"
SRCDATE_matchbox-panel ?= "20060727"
SRCDATE_matchbox-panel-manager ?= "20060612"
@@ -128,7 +126,7 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-desktop ?= "2.0"
PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"

20
meta/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
View File

@@ -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

11
meta/packages/matchbox-desktop/matchbox-desktop_2.0.bb Normal file
View File

@@ -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

34
meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
View File

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