summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:31 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 23:02:54 +0200
commit75326a51b2b0ea837de91fc2328b1f44e0fcc7fe (patch)
tree7607fd6c100c354b33c55e306e55eb1d52ff1626
parent3b468acbb4ec2aca748fc022ff0d53a530b3264b (diff)
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" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/matchbox-common/Config.in4
-rw-r--r--package/matchbox-desktop/Config.in2
-rw-r--r--package/matchbox-keyboard/Config.in2
-rw-r--r--package/matchbox-panel/Config.in2
-rw-r--r--package/matchbox/Config.in2
5 files changed, 6 insertions, 6 deletions
diff --git a/package/matchbox-common/Config.in b/package/matchbox-common/Config.in
index 7d22d05f1..f1c4ce3e1 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 c9fd19613..ed80c223d 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 e017358b3..056a255cb 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 e3daaf5fa..47bd10ad7 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 3d771d3cc..344635cc9 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