# HG changeset patch # User Christophe Lincoln # Date 1208984782 -7200 # Node ID 585bd52eb85b46eed7b6e176fc4396f0866a97a4 # Parent 3f64a45a68c2e87d195afe4ac322a6c8e23d0d0e Removed misc files + replace iso8859-15 by koi8 for Russian support diff -r 3f64a45a68c2 -r 585bd52eb85b geany/receipt --- a/geany/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/geany/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -32,4 +32,5 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/share/geany $fs/usr/share cp -a stuff/filetype_extensions.conf $fs/usr/share/geany + rm $fs/usr/share/geany/GPL-2 } diff -r 3f64a45a68c2 -r 585bd52eb85b glibc-base/stuff/locale-archive Binary file glibc-base/stuff/locale-archive has changed diff -r 3f64a45a68c2 -r 585bd52eb85b glibc-base/stuff/wanted-files.list --- a/glibc-base/stuff/wanted-files.list Wed Apr 23 21:37:27 2008 +0200 +++ b/glibc-base/stuff/wanted-files.list Wed Apr 23 23:06:22 2008 +0200 @@ -15,12 +15,13 @@ /usr/lib/gconv/UNICODE.so /usr/lib/gconv/gconv-modules -/usr/lib/gconv/ISO8859-15.so +/usr/lib/gconv/ANSI_X3.110.so /usr/lib/gconv/ISO8859-1.so -/usr/lib/gconv/ANSI_X3.110.so /usr/lib/gconv/ISO8859-2.so +/usr/lib/gconv/KOI8-RU.so /usr/share/zoneinfo/Europe/Madrid +/usr/share/zoneinfo/Europe/Moscow /usr/share/zoneinfo/Europe/London /usr/share/zoneinfo/Europe/Zurich /usr/share/zoneinfo/Europe/Paris diff -r 3f64a45a68c2 -r 585bd52eb85b glibc-locale/receipt --- a/glibc-locale/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/glibc-locale/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -39,8 +39,8 @@ # Rm files provided by locale-pack. for i in cs es fr ru do + echo -n "* Removing locale: $i" rm -rf $fs/usr/share/locale/$i + status done - # Gconv files - rm -f $fs/usr/lib/gconv/KOI8-RU.so } diff -r 3f64a45a68c2 -r 585bd52eb85b libxml2-dev/receipt --- a/libxml2-dev/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/libxml2-dev/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -11,9 +11,13 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/usr/share + mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share + + cp -a $_pkg/usr/bin/xml2-config $fs/usr/bin + cp -a $_pkg/usr/lib/*.sh $fs/usr/bin + chmod +x $fs/usr/bin/*.sh + cp -a $_pkg/usr/lib/*.*a $fs/usr/lib - cp -a $_pkg/usr/lib/*.sh $fs/usr/lib cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/share/aclocal $fs/usr/share diff -r 3f64a45a68c2 -r 585bd52eb85b libxml2/receipt --- a/libxml2/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/libxml2/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -17,8 +17,10 @@ { cd $src ./configure \ - --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man --with-html-dir=/usr/share/doc + --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --with-html-dir=/usr/share/doc $CONFIGURE_ARGS make make DESTDIR=$PWD/_pkg install @@ -30,6 +32,5 @@ mkdir -p $fs/usr/lib cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/bin $fs/usr - strip -s $fs/usr/lib/* - strip -s $fs/usr/bin/* 2>/dev/null + rm $fs/usr/bin/xml2-config } diff -r 3f64a45a68c2 -r 585bd52eb85b locale-cs/receipt --- a/locale-cs/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/locale-cs/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -10,18 +10,18 @@ WEB_SITE="http://www.slitaz.org/" SOURCES="glibc" +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" + LOCALE="cs" LOCALEDEF="cs_CZ" CHARMAP="ISO-8859-2" -CORE_PKGS="geany gparted leafpad" GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg PKG_NAME="$PACKAGE" PKG_VERS="$VERSION" # Rules to gen a SliTaz package suitable for Tazpkg. -# Install files in /usr/lib/locale. UTF-8: -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 +# Install files in /usr/lib/locale. # genpkg_rules() { @@ -38,7 +38,7 @@ done # Glibc locale. - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale PACKAGE="$PKG_NAME" VERSION="$PKG_VERS" diff -r 3f64a45a68c2 -r 585bd52eb85b locale-es/receipt --- a/locale-es/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/locale-es/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -9,18 +9,18 @@ BUILD_DEPENDS="glibc glibc-locale" WEB_SITE="http://www.slitaz.org/" +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" + LOCALE="es" LOCALEDEF="es_ES" CHARMAP="ISO-8859-1" -CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg PKG_NAME="$PACKAGE" PKG_VERS="$VERSION" # Rules to gen a SliTaz package suitable for Tazpkg. -# Install files in /usr/lib/locale. UTF-8: -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 +# Install files in /usr/lib/locale. # genpkg_rules() { @@ -37,7 +37,7 @@ done # Glibc locale. - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale PACKAGE="$PKG_NAME" VERSION="$PKG_VERS" diff -r 3f64a45a68c2 -r 585bd52eb85b locale-ru/receipt --- a/locale-ru/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/locale-ru/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -9,19 +9,18 @@ BUILD_DEPENDS="glibc glibc-locale xorg-libX11" WEB_SITE="http://www.slitaz.org/" +CORE_PKGS="asunder epdfview geany gpicview gparted glib gtk+ leafpad xpad" + LOCALE="ru" LOCALEDEF="ru_RU" CHARMAP="KOI8-RU" -CORE_PKGS="asunder emelfm2 epdfview geany gparted leafpad xpad" -LIBX11_VERSION="1.1.3" GLIBC_FILES=$WOK/glibc/glibc-2.7/_pkg PKG_NAME="$PACKAGE" PKG_VERS="$VERSION" # Rules to gen a SliTaz package suitable for Tazpkg. -# Install files in /usr/lib/locale. UTF-8: -# localedef -i $LOCALEDEF -f UTF-8 $root/usr/lib/locale/$LOCALEDEF.utf8 +# Install files in /usr/lib/locale. # genpkg_rules() { @@ -37,17 +36,8 @@ fi done - # X11 locale. - #mkdir -p $fs/usr/share/X11/locale - #cp -a $WOK/xorg-libX11/libX11-$LIBX11_VERSION/_pkg/usr/share/X11/locale/iso8859-5 \ - # $fs/usr/share/X11/locale - - # KOI8-RU gconv lib. - mkdir -p $fs/usr/lib/gconv - cp -a $GLIBC_FILES/usr/lib/gconv/$CHARMAP.so $fs/usr/lib/gconv - # Glibc locale. - cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale + #cp -a $GLIBC_FILES/usr/share/locale/$LOCALE $fs/usr/share/locale PACKAGE="$PKG_NAME" VERSION="$PKG_VERS" diff -r 3f64a45a68c2 -r 585bd52eb85b xorg-libX11/receipt --- a/xorg-libX11/receipt Wed Apr 23 21:37:27 2008 +0200 +++ b/xorg-libX11/receipt Wed Apr 23 23:06:22 2008 +0200 @@ -6,7 +6,7 @@ SHORT_DESC="X11 main client interface to X window system." MAINTAINER="pankso@slitaz.org" DEPENDS="xorg" -BUILD_DEPENDS="xorg-dev-proto xorg-libXau" +BUILD_DEPENDS="xorg-dev-proto xorg-libXau xtrans" SOURCE="libX11" TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://www.x.org/" @@ -31,15 +31,16 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/share/X11/locale + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/X11 $fs/usr/lib cp -a $_pkg/usr/share/X11/*DB $fs/usr/share/X11 # X11 locale. - cp -a $_pkg/usr/share/X11/locale/C $fs/usr/share/X11/locale - cp -a $_pkg/usr/share/X11/locale/iso8859-1 $fs/usr/share/X11/locale - cp -a $_pkg/usr/share/X11/locale/iso8859-2 $fs/usr/share/X11/locale - cp -a $_pkg/usr/share/X11/locale/iso8859-15 $fs/usr/share/X11/locale + for i in C iso8859-1 iso8859-2 koi8-r + do + cp -a $_pkg/usr/share/X11/locale/$i $fs/usr/share/X11/locale + done cp -a $_pkg/usr/share/X11/locale/*.dir $fs/usr/share/X11/locale cp -a $_pkg/usr/share/X11/locale/*.alias $fs/usr/share/X11/locale }