From 75326a51b2b0ea837de91fc2328b1f44e0fcc7fe Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 3 Jun 2015 22:41:31 +0200 Subject: [PATCH] package/matchbox: fix option prompts Use the package names instead of some fancy human-readable strings. ;-) Note: the matchbox package is really named matchbox-window-manager by upstream. However: - it already is in a section of the menu title 'X window managers' - users are probably only looking for 'matchbox' - keeping just 'matchbox' keeps it in sync with the Kconfig variable, and allows us to not handle a legacy entry (see a previous commit) - matchbox-window-manager is a bit long. ;-) So, in this case, the short 'matchbox' prompt is used instead of the real upstream name. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/matchbox-common/Config.in | 4 ++-- package/matchbox-desktop/Config.in | 2 +- package/matchbox-keyboard/Config.in | 2 +- package/matchbox-panel/Config.in | 2 +- package/matchbox/Config.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/matchbox-common/Config.in b/package/matchbox-common/Config.in index 7d22d05f19..f1c4ce3e1b 100644 --- a/package/matchbox-common/Config.in +++ b/package/matchbox-common/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_MATCHBOX_COMMON - bool "Matchbox session common files" + bool "matchbox-common" depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP help Common desktop folders and matchbox-session script. config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style desktop folders" + bool "PDA style app folder" depends on BR2_PACKAGE_MATCHBOX_COMMON diff --git a/package/matchbox-desktop/Config.in b/package/matchbox-desktop/Config.in index c9fd196134..ed80c223d3 100644 --- a/package/matchbox-desktop/Config.in +++ b/package/matchbox-desktop/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" + bool "matchbox-desktop" select BR2_PACKAGE_ZLIB help A PDA style application launcher or 'item browser'. diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in index e017358b35..056a255cb4 100644 --- a/package/matchbox-keyboard/Config.in +++ b/package/matchbox-keyboard/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "Matchbox Virtual Keyboard" + bool "matchbox-keyboard" select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO select BR2_PACKAGE_MATCHBOX_FAKEKEY diff --git a/package/matchbox-panel/Config.in b/package/matchbox-panel/Config.in index e3daaf5fae..47bd10ad7e 100644 --- a/package/matchbox-panel/Config.in +++ b/package/matchbox-panel/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" + bool "matchbox-panel" select BR2_PACKAGE_MATCHBOX_LIB help A flexible always present 'window bar' for holding diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 3d771d3cc6..344635cc97 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX - bool "MatchBox Window Manager" + bool "matchbox" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG -- 2.30.2