summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-07 14:56:30 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-08 10:54:22 +0200
commita251189836d0a82404b393340be64d5d5de7a592 (patch)
treeeabd73992ca36683c5ad2cfb6d48c0d442135094
parentce4885a60e7d14dcdd480e9610e840e25f410e2d (diff)
downloadptxdist-a251189836d0a82404b393340be64d5d5de7a592.tar.gz
ptxdist-a251189836d0a82404b393340be64d5d5de7a592.tar.xz
xorg-font-intl: move to staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/xorg-font-international.in12
-rw-r--r--rules/xorg-font-intl.in18
2 files changed, 18 insertions, 12 deletions
diff --git a/rules/xorg-font-international.in b/rules/xorg-font-international.in
new file mode 100644
index 000000000..f428d2744
--- /dev/null
+++ b/rules/xorg-font-international.in
@@ -0,0 +1,12 @@
+## SECTION=multimedia_xorg_font
+
+menu "international fonts for X "
+ depends on MENU_XORG_FONTS
+
+comment "cyrillic fonts"
+source "generated/multimedia_xorg_font_cyrillic.in"
+
+comment "other language fonts "
+source "generated/multimedia_xorg_font_other.in"
+
+endmenu
diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
index 1235e38ed..1674be6ce 100644
--- a/rules/xorg-font-intl.in
+++ b/rules/xorg-font-intl.in
@@ -1,12 +1,14 @@
-## SECTION=multimedia_xorg_font
-
-menu "international fonts for X "
- depends on MENU_XORG_FONTS
+## SECTION=staging
+## old section:
+### SECTION=multimedia_xorg_font
menuconfig XORG_FONT_INTL
bool
prompt "chinese and other asian fonts"
select XORG_FONTS
+ help
+ STAGING: remove in ptxdist-2021.06.0
+ Unclear license for some of the fonts and not really needed anymore.
config XORG_FONT_INTL_CHIN
bool
@@ -50,11 +52,3 @@ config XORG_FONT_INTL_ASIAN
This package includes fonts in thai, vietnamese, inian, lao and several
further asian languages.
-comment "cyrillic fonts"
-source "generated/multimedia_xorg_font_cyrillic.in"
-
-comment "other language fonts "
-source "generated/multimedia_xorg_font_other.in"
-
-endmenu
-