wok diff locale-id/receipt @ rev 15145

expect: filter wrong error trigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Aug 15 12:52:35 2013 +0000 (2013-08-15)
parents bcfe199cef3f
children 48d3d669a814
line diff
     1.1 --- a/locale-id/receipt	Mon Feb 27 11:20:24 2012 +0100
     1.2 +++ b/locale-id/receipt	Thu Aug 15 12:52:35 2013 +0000
     1.3 @@ -1,38 +1,27 @@
     1.4  # SliTaz package receipt
     1.5  
     1.6  PACKAGE="locale-id"
     1.7 -VERSION="4.0"
     1.8 +VERSION="4.1"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Indonesian locale pack."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 +WEB_SITE="http://www.slitaz.org/"
    1.13 +
    1.14 +WANTED="glibc slitaz-i18n xorg-libX11"
    1.15  DEPENDS="glibc-base"
    1.16 -BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
    1.17 -WEB_SITE="http://www.slitaz.org/"
    1.18 -WANTED="slitaz-i18n"
    1.19  
    1.20  LOCALE="id"
    1.21 -LOCALEDEF="id_ID"
    1.22 -CHARMAP="UTF-8"
    1.23  
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26 -{	
    1.27 +{
    1.28  	. $WOK/slitaz-i18n/stuff/locale-pack.functions
    1.29  	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    1.30 -	mk_locale_dir
    1.31 -	get_slitaz_messages
    1.32 -	get_core_messages
    1.33 -	# Pregenerate locale file so we dont need glibc-locale as dep.
    1.34 -	mkdir -p $fs/usr/lib/locale
    1.35 -	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
    1.36 +	get_locale
    1.37  }
    1.38  
    1.39  # Back to C if it's the last used locale.
    1.40  post_remove()
    1.41  {
    1.42 -	if grep -q $LOCALEDEF /etc/locale.conf; then
    1.43 -		echo "LANG=C" > /etc/locale.conf
    1.44 -		echo "LC_ALL=C" >> /etc/locale.conf
    1.45 -	fi
    1.46 -	rm -rf /usr/lib/locale/$LOCALEDEF
    1.47 +	echo -e "LANG=C\nLC_ALL=C" > /etc/locale.conf
    1.48  }