diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-11-15 14:10:54 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-11-15 14:10:54 +0000 |
| commit | 3515feb8a17b9d84bee4d11191842223ce6f76a6 (patch) | |
| tree | 38c0d802f3d26d3ac11937427d0221b04c0d0a01 /packages | |
| parent | 12bbfc94ec84e9b899d7d519aaf1181ef2590183 (diff) | |
| parent | ec3c76692048d3401a3ce0a7cb1ae2231d45c41e (diff) | |
merge of '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
and 'b21b578d6a02e2eb83b67423222b1cb7e6fcfc49'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/matchbox-common/matchbox-common_0.9.1.bb | 10 | ||||
| -rw-r--r-- | packages/matchbox-wm/matchbox-wm_1.2.bb | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index fa6e989b16..ca68003b94 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -2,13 +2,13 @@ DESCRIPTION = "Matchbox window manager common files" SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r3" +PR = "r4" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://no-utilities-category.patch;patch=1 \ file://add-media-category.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig update-alternatives EXTRA_OECONF = "--enable-pda-folders" @@ -17,4 +17,10 @@ FILES_${PN} = "\ ${datadir}/matchbox/vfolders \ ${datadir}/pixmaps" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" +ALTERNATIVE_PRIORITY = "11" + + PACKAGE_ARCH = "all" diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index bf3587696f..bf57441815 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -3,7 +3,7 @@ require matchbox-wm.inc DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " RDEPENDS = "" -PR="r2" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://gconf-2.m4 \ @@ -23,7 +23,7 @@ FILES_${PN} = "${bindir}/* \ ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager" ALTERNATIVE_PRIORITY = "10" EXTRA_OECONF = " \ |