r552 - in x86/branches/utf8: . doc isolinux packages packages/man-fr packages/man-pages-es packages/man-pages-it packages/manpages-de packages/manpages-ru

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Aug 4 21:55:11 PDT 2005


Author: alexander
Date: 2005-08-04 22:54:47 -0600 (Thu, 04 Aug 2005)
New Revision: 552

Added:
   x86/branches/utf8/packages/man-fr/
   x86/branches/utf8/packages/man-fr/Makefile
   x86/branches/utf8/packages/man-pages-es/
   x86/branches/utf8/packages/man-pages-es/Makefile
   x86/branches/utf8/packages/man-pages-it/
   x86/branches/utf8/packages/man-pages-it/Makefile
   x86/branches/utf8/packages/manpages-de/
   x86/branches/utf8/packages/manpages-de/Makefile
   x86/branches/utf8/packages/manpages-ru/
   x86/branches/utf8/packages/manpages-ru/Makefile
Removed:
   x86/branches/utf8/isolinux/keymaps.msg
   x86/branches/utf8/isolinux/locales1.msg
   x86/branches/utf8/isolinux/locales2.msg
Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/doc/README
   x86/branches/utf8/isolinux/isolinux.cfg
   x86/branches/utf8/isolinux/options.msg
Log:
Added translated manual pages:

French, German, Italian: ISO-8859-1 examples
Spanish: example when conversion from UTF-8 is needed
Russian: example of manual pages in the country's primary 8-bit Linux encoding

Edited README and boot loader help screens.


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -186,7 +186,8 @@
 	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd \
 	ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin \
-	ch-mdadm ch-eject ch-byacc ch-ed ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
+	ch-mdadm ch-eject ch-byacc ch-ed ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux ch-nALFS-profile \
+	ch-man-fr ch-manpages-de ch-man-pages-it ch-man-pages-es ch-manpages-ru
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -929,6 +930,26 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+man-fr: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+manpages-de: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+man-pages-it: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+man-pages-es: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
+manpages-ru: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 initramfs: prep-chroot
 	make -C $@ chroot
 	make unmount
@@ -1472,6 +1493,21 @@
 ch-nALFS-profile: popdev
 	make -C $(PKG)/nALFS-profile stage2
 
+ch-man-fr: popdev
+	make -C $(PKG)/man-fr stage2
+
+ch-manpages-de: popdev
+	make -C $(PKG)/manpages-de stage2
+
+ch-man-pages-it: popdev
+	make -C $(PKG)/man-pages-it stage2
+
+ch-man-pages-es: popdev
+	make -C $(PKG)/man-pages-es stage2
+
+ch-manpages-ru: popdev
+	make -C $(PKG)/manpages-ru stage2
+
 ch-initramfs: popdev
 	make -C initramfs
 

Modified: x86/branches/utf8/doc/README
===================================================================
--- x86/branches/utf8/doc/README	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/doc/README	2005-08-05 04:54:47 UTC (rev 552)
@@ -131,31 +131,29 @@
 ================
 It is possible to specify the locale using the bootloader prompt, like this:
 
-  linux LANG=es_ES.ISO-8859-1
+  linux LANG=es_ES at euro
 
 The CD tries to guess the proper screen font and keymap based on this
-information.
+information. If the guess is wrong, you can override it by adding the
+following parameters:
 
-Alternatively, these items can be configured interactively using dialog-based
-interface if the locale is not specified on the boot prompt.
+  KEYMAP: specifies the console keymap(s) to load (actually the arguments to
+  the "loadkeys" program separated by the "+" sign), e.g: KEYMAP=es+euro1
 
-By default, the Euro character is not added to the keymap. You can add it
-manually later in non-UTF-8 locales by typing:
+  LEGACY_CHARSET: sometimes a ready-made UTF-8 keymap is not available and
+  must be obtained by converting an existing keymap from this charset to UTF-8.
+  E.g.: LEGACY_CHARSET=iso-8859-15
+  This parameter is not used in non-UTF-8 locales.
 
-  loadkeys euro
+  FONT: specifies the screen font to set (actually, the arguments to the
+  "setfont" program separated by the "+" sign), e.g:
+  FONT=LatArCyrHeb-16+-m+8859-15
 
-(this will put the Euro sign and Eurocent to Alt+E and Alt+C, respectively)
-or
+  XKEYMAP: the keymap to use with X window system, e.g. XKEYMAP=us_intl
 
-  loadkeys euro1
+Alternatively, these items can be configured interactively using dialog-based
+interface if the locale is not specified on the boot prompt.
 
-(this will put the Euro sign and Eurocent to AltGr+5 and AltGr+C, respectively)
-or
-
-  loadkeys euro2
-
-(this will put the Euro sign and Eurocent to AltGr+E and AltGr+C, respectively)
-
 For some locales (e.g. lv_LV.ISO-8859-13) there is no valid console keymap,
 but there is a keymap for X. In this case, the only solution is to use X.
 Languages that need special input method software (e.g. Chinese, Japanese
@@ -164,7 +162,8 @@
 While this CD configures the LANG environment variable, console font and
 keymap for you, it's your responsibility to configure other locale-dependent
 parameters manually. You may want to configure character sets for SAMBA in
-/etc/samba/smb.conf, and to explicitly specify the "iocharset" and "codepage"options when mounting filesystems with Windows origin (e.g., vfat and isofs).
+/etc/samba/smb.conf, and to explicitly specify the "iocharset" and "codepage"
+options when mounting filesystems with Windows origin (e.g., vfat and isofs).
 
 The CD contains TrueType fonts that cover the orthography of most of European
 languages. No additional configuration is required in order to use them.

Modified: x86/branches/utf8/isolinux/isolinux.cfg
===================================================================
--- x86/branches/utf8/isolinux/isolinux.cfg	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/isolinux/isolinux.cfg	2005-08-05 04:54:47 UTC (rev 552)
@@ -4,9 +4,6 @@
 timeout 600
 display boot.msg
 F1 options.msg
-F2 locales1.msg
-F3 locales2.msg
-F4 keymaps.msg
 
 label linux
   kernel linux

Deleted: x86/branches/utf8/isolinux/keymaps.msg
===================================================================
--- x86/branches/utf8/isolinux/keymaps.msg	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/isolinux/keymaps.msg	2005-08-05 04:54:47 UTC (rev 552)
@@ -1,29 +0,0 @@
-70
07The following keymaps are available on this CD:
-
-azerty:
-azerty be-latin1 fr-latin1 fr-latin9 fr fr-pc wangbe wangbe2
-
-dvorak:
-ANSI-dvorak dvorak-l dvorak dvorak-r
-
-fgGIod:
-tr_f-latin5 trf
-
-qwerty:
-bg_bds-cp1251 bg-cp1251 bg_pho-cp1251 br-abnt br-abnt2 br-latin1-abnt2
-br-latin1-us by2_win cf cz-cp1250 cz-lat2 cz-lat2-prog cz dk-latin1 dk
-es et et-nodeadkeys fi-latin1 fi-latin9 fi gr gr-pc hu101
-il-heb il il-phonetic is-latin1 is-latin1-us it it-ibm it2 jp106
-la-latin1 lt.baltic lt.l4 mk0 mk-cp1251 mk nl nl2 no-latin1 no
-pc110 pl pl2 pt-latin1 pt-latin9 ro_win ru1 ru3 ru4 ru-ms ru-yawerty
-se-ir209 se-lat6 sk-prog-qwerty sk-qwerty sr-cy sv-latin1 tralt tr_q-latin5
-trq ua ua-ws uk us-acentos us
-
-qwertz:
-croat cz-us-qwertz de_CH-latin1 de-latin1 de-latin1-nodeadkeys de fr_CH-latin1
-fr_CH hu sg-latin1-lk450 sg-latin1 sg sk-prog-qwertz sk-qwertz slovene
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Deleted: x86/branches/utf8/isolinux/locales1.msg
===================================================================
--- x86/branches/utf8/isolinux/locales1.msg	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/isolinux/locales1.msg	2005-08-05 04:54:47 UTC (rev 552)
@@ -1,29 +0,0 @@
-70
07Available locales (page 1 of 2)
-
-aa_DJ.ISO-8859-1         en_AU.ISO-8859-1         es_ES.ISO-8859-15 at euro
-af_ZA.ISO-8859-1         en_BW.ISO-8859-1         es_GT.ISO-8859-1
-an_ES.ISO-8859-15        en_CA.ISO-8859-1         es_HN.ISO-8859-1
-be_BY.CP1251             en_DK.ISO-8859-1         es_MX.ISO-8859-1
-bg_BG.CP1251             en_GB.ISO-8859-1         es_NI.ISO-8859-1
-br_FR.ISO-8859-1         en_HK.ISO-8859-1         es_PA.ISO-8859-1
-br_FR.ISO-8859-15 at euro   en_IE.ISO-8859-1         es_PE.ISO-8859-1
-bs_BA.ISO-8859-2         en_IE.ISO-8859-15 at euro   es_PR.ISO-8859-1
-ca_ES.ISO-8859-1         en_NZ.ISO-8859-1         es_PY.ISO-8859-1
-ca_ES.ISO-8859-15 at euro   en_PH.ISO-8859-1         es_SV.ISO-8859-1
-cs_CZ.ISO-8859-2         en_SG.ISO-8859-1         es_US.ISO-8859-1
-da_DK.ISO-8859-1         en_US.ISO-8859-1         es_UY.ISO-8859-1
-de_AT.ISO-8859-1         en_ZA.ISO-8859-1         es_VE.ISO-8859-1
-de_AT.ISO-8859-15 at euro   en_ZW.ISO-8859-1         et_EE.ISO-8859-1
-de_BE.ISO-8859-1         es_AR.ISO-8859-1         et_EE.ISO-8859-15
-de_BE.ISO-8859-15 at euro   es_BO.ISO-8859-1         eu_ES.ISO-8859-1
-de_CH.ISO-8859-1         es_CL.ISO-8859-1         eu_ES.ISO-8859-15 at euro
-de_DE.ISO-8859-1         es_CO.ISO-8859-1         fi_FI.ISO-8859-1
-de_DE.ISO-8859-15 at euro   es_CR.ISO-8859-1         fi_FI.ISO-8859-15 at euro
-de_LU.ISO-8859-1         es_DO.ISO-8859-1         fo_FO.ISO-8859-1
-de_LU.ISO-8859-15 at euro   es_EC.ISO-8859-1         fr_BE.ISO-8859-1
-el_GR.ISO-8859-7         es_ES.ISO-8859-1         fr_BE.ISO-8859-15 at euro
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Deleted: x86/branches/utf8/isolinux/locales2.msg
===================================================================
--- x86/branches/utf8/isolinux/locales2.msg	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/isolinux/locales2.msg	2005-08-05 04:54:47 UTC (rev 552)
@@ -1,29 +0,0 @@
-70
07Available locales (page 2 of 2)
-
-fr_CA.ISO-8859-1         lt_LT.ISO-8859-13        sk_SK.ISO-8859-2
-fr_CH.ISO-8859-1         lv_LV.ISO-8859-13        sl_SI.ISO-8859-2
-fr_FR.ISO-8859-1         mi_NZ.ISO-8859-13        so_DJ.ISO-8859-1
-fr_FR.ISO-8859-15 at euro   mk_MK.ISO-8859-5         so_KE.ISO-8859-1
-fr_LU.ISO-8859-1         ms_MY.ISO-8859-1         so_SO.ISO-8859-1
-fr_LU.ISO-8859-15 at euro   mt_MT.ISO-8859-3         sq_AL.ISO-8859-1
-ga_IE.ISO-8859-1         nb_NO.ISO-8859-1         st_ZA.ISO-8859-1
-ga_IE.ISO-8859-15 at euro   nl_BE.ISO-8859-1         sv_FI.ISO-8859-1
-gd_GB.ISO-8859-15        nl_BE.ISO-8859-15 at euro   sv_FI.ISO-8859-15 at euro
-gl_ES.ISO-8859-1         nl_NL.ISO-8859-1         sv_SE.ISO-8859-1
-gl_ES.ISO-8859-15 at euro   nl_NL.ISO-8859-15 at euro   tg_TJ.KOI8-T
-gv_GB.ISO-8859-1         nn_NO.ISO-8859-1         tl_PH.ISO-8859-1
-hr_HR.ISO-8859-2         oc_FR.ISO-8859-1         uk_UA.KOI8-U
-hu_HU.ISO-8859-2         om_KE.ISO-8859-1         uz_UZ.ISO-8859-1
-id_ID.ISO-8859-1         pl_PL.ISO-8859-2         wa_BE.ISO-8859-1
-is_IS.ISO-8859-1         pt_BR.ISO-8859-1         wa_BE.ISO-8859-15 at euro
-it_CH.ISO-8859-1         pt_PT.ISO-8859-1         xh_ZA.ISO-8859-1
-it_IT.ISO-8859-1         pt_PT.ISO-8859-15 at euro   zu_ZA.ISO-8859-1
-it_IT.ISO-8859-15 at euro   ro_RO.ISO-8859-2         
-kl_GL.ISO-8859-1         ru_RU.ISO-8859-5         
-kw_GB.ISO-8859-1         ru_RU.KOI8-R             
-lg_UG.ISO-8859-10        ru_UA.KOI8-U             
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Modified: x86/branches/utf8/isolinux/options.msg
===================================================================
--- x86/branches/utf8/isolinux/options.msg	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/isolinux/options.msg	2005-08-05 04:54:47 UTC (rev 552)
@@ -20,9 +20,10 @@
 is set to UTC instead of local time.
 
 Set your locale by adding LANG=your_locale anywhere after
-"linux". To see the list of presumably working locales,
-press F2 and F3. Add KEYMAP=your_keymap to set the keyboard
-layout. To see the list of available keymaps, press F4.
+"linux".
 
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
+If you don't specify your timezone or locale at the boot prompt,
+a configuration dialog will appear later during boot.
 
+More information is available in /root/README on this CD.
+

Added: x86/branches/utf8/packages/man-fr/Makefile
===================================================================
--- x86/branches/utf8/packages/man-fr/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/packages/man-fr/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -0,0 +1,28 @@
+# Man-fr Makefile
+
+# Package versions
+NM= man-fr
+VRS= 1.58
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).0.tar.bz2
+# This is very slow (~800 bytes per second), TODO: add a mirror
+URL= http://ccb.club.fr/man/$(FILE)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM)"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/share/man/fr/man7 ] ; then unpack $(FILE) && \
+	 cd $(DIR) && cp -r man? /usr/share/man/fr ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)
+

Added: x86/branches/utf8/packages/man-pages-es/Makefile
===================================================================
--- x86/branches/utf8/packages/man-pages-es/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/packages/man-pages-es/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -0,0 +1,32 @@
+# Man-pages-es Makefile
+
+# Package versions
+NM= man-pages-es
+VRS= 1.55
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://ditec.um.es/~piernas/manpages-es/$(FILE)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+# man7/iso_8859-7.7 is not in UTF-8 like the rest of the pages. Bug.
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM)"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/share/man/es/man7 ] ; then unpack $(FILE) && \
+	 cd $(DIR) && find man? -type f | grep -v 'man7/iso_8859-7.7' | \
+	 while read F ; do \
+	  iconv -f UTF-8 -t ISO-8859-1 $$F >tmp ; \
+	  mv tmp $$F ; done && \
+	 cp -r man? /usr/share/man/es ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)
+

Added: x86/branches/utf8/packages/man-pages-it/Makefile
===================================================================
--- x86/branches/utf8/packages/man-pages-it/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/packages/man-pages-it/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -0,0 +1,28 @@
+# Man-pages-it Makefile
+
+# Package versions
+NM= man-pages-it
+VRS= 0.3.4
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.gz
+URL= http://ftp.pluto.it/pub/pluto/ildp/man/$(NM)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM)"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/share/man/it/man7 ] ; then \
+	 mkdir $(DIR) && cd $(DIR) && unpack ../$(FILE) && \
+	 cp -r man? /usr/share/man/it ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)
+

Added: x86/branches/utf8/packages/manpages-de/Makefile
===================================================================
--- x86/branches/utf8/packages/manpages-de/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/packages/manpages-de/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -0,0 +1,28 @@
+# Manpages-de Makefile
+
+# Package versions
+NM= manpages-de
+VRS= 0.4
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.gz
+# This is very slow (~800 bytes per second), TODO: add a mirror
+URL= http://www.infodrom.org/projects/manpages-de/download/$(FILE)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM)"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/share/man/de/man7 ] ; then unpack $(FILE) && \
+	 cd $(DIR) && cp -r man? /usr/share/man/de ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)
+

Added: x86/branches/utf8/packages/manpages-ru/Makefile
===================================================================
--- x86/branches/utf8/packages/manpages-ru/Makefile	2005-08-05 01:52:53 UTC (rev 551)
+++ x86/branches/utf8/packages/manpages-ru/Makefile	2005-08-05 04:54:47 UTC (rev 552)
@@ -0,0 +1,27 @@
+# Manpages-ru Makefile
+
+# Package versions
+NM= manpages-ru
+VRS= 0.98
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://www.linuxshare.ru/projects/trans/$(FILE)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM)"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /usr/share/man/ru/man7 ] ; then unpack $(FILE) && \
+	 cd $(DIR) && cp -r man? /usr/share/man/ru ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)
+




More information about the livecd mailing list