[PATCH 0/1] Fix incorrect update-alternative settings in matchbox-wm-2

[PATCH 0/1] Fix incorrect update-alternative settings in matchbox-wm-2

[Mark Hatle]

This looks like it was a simple copy/paste induced error.. fixed.w

The following changes since commit 89788fbd10fdfbbe54927339d7ec516d0e4d7ef5:

  libproxy: Allow to build in non-gplv3 configuration (2012-04-17 14:08:27 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib mhatle/fixes
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fixes

Mark Hatle (1):
  matchbox-wm-2: Fix incorrect update-alternatives

 .../matchbox-wm-2/matchbox-wm-2_git.bb             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.3.4

[PATCH 1/1] matchbox-wm-2: Fix incorrect update-alternatives

[Mark Hatle]

Update-alternatives was pointing to matchbox-session, and should have
been pointing to matchbox-window-manager.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 .../matchbox-wm-2/matchbox-wm-2_git.bb             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 9961728..4aad3a9 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pa
 
 SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
 PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;proto=git \
 	file://fix_makefile.patch \
@@ -22,7 +22,7 @@ inherit autotools pkgconfig update-alternatives
 # matchbox-window-manager-2.
 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"
 
 PACKAGES =+ "libmatchbox2"
-- 
1.7.3.4

Re: [PATCH 0/1] Fix incorrect update-alternative settings in matchbox-wm-2

[Saul Wold]

On 04/17/2012 03:05 PM, Mark Hatle wrote:
> This looks like it was a simple copy/paste induced error.. fixed.w
>
> The following changes since commit 89788fbd10fdfbbe54927339d7ec516d0e4d7ef5:
>
>    libproxy: Allow to build in non-gplv3 configuration (2012-04-17 14:08:27 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib mhatle/fixes
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/fixes
>
> Mark Hatle (1):
>    matchbox-wm-2: Fix incorrect update-alternatives
>
>   .../matchbox-wm-2/matchbox-wm-2_git.bb             |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!