# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1298336175 -3600
# Node ID 08c39bd8d068c96ad3a97049eb78c80e9c44c14e
# Parent  8ededfb1d957921f720a004a1abb07fd20f132b4
Last commit here: tazwok is no more experimental

diff -r 8ededfb1d957 -r 08c39bd8d068 chroot-scripts/cook-toolchain
--- a/chroot-scripts/cook-toolchain	Sun Feb 20 19:56:03 2011 +0100
+++ b/chroot-scripts/cook-toolchain	Tue Feb 22 01:56:15 2011 +0100
@@ -14,7 +14,7 @@
 report step "Initializing tools & environment"
 
 # Theses fours packages will be needed later.
-for p in libtaz tazwok-experimental slitaz-base-files tazpkg; do
+for p in libtaz tazwok slitaz-base-files tazpkg; do
 	tazwok cook $p
 done
 
@@ -108,7 +108,7 @@
 mkdir -p /tmp/backup/var/lib/tazpkg
 sed 's/^AUTO_INSTALL_DEPS="yes"/AUTO_INSTALL_DEPS="no"/' -i \
 	/etc/slitaz/tazpkg.conf
-BASE_PKGS="tazpkg tazwok-experimental slitaz-base-files libtaz"
+BASE_PKGS="tazpkg tazwok slitaz-base-files libtaz"
 for i in $BASE_PKGS; do
 	echo N | tazpkg get-install $i --root=/tmp/backup --forced
 done
@@ -166,6 +166,6 @@
 # of the presence of new executables even if they're first in
 # $PATH.
 
-cat /tmp/toolchain.list | while read PACKAGE; do
+cat /tmp/cooklist | while read PACKAGE; do
 	tazwok cook $PACKAGE || exit 1
 done
diff -r 8ededfb1d957 -r 08c39bd8d068 chroot-scripts/gen-iso
--- a/chroot-scripts/gen-iso	Sun Feb 20 19:56:03 2011 +0100
+++ b/chroot-scripts/gen-iso	Tue Feb 22 01:56:15 2011 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Little script to cook flavor in tazwok-experimental' chroot waiting
+# Little script to cook flavor in tazwok chroot waiting
 # for something more consistent into tazlito.
 
 [ "$1" ] || { echo "Usage: gen-iso flavorname [gzip]" >&2; exit 1; }
diff -r 8ededfb1d957 -r 08c39bd8d068 doc/tazwok.html
--- a/doc/tazwok.html	Sun Feb 20 19:56:03 2011 +0100
+++ b/doc/tazwok.html	Tue Feb 22 01:56:15 2011 +0100
@@ -41,7 +41,7 @@
 
 <h2>AVERTISSEMENT</h2>
 <p>
-Cette version de tazwok (tazwok-experimental) est actuellement sujette
+Cette version de tazwok (tazwok-3.9.*) est actuellement sujette
 à un développement actif et certaine parties de programme n'ont pas
 encore été complétement revues et corrigées. Dans son état actuel,
 vous ne devriez cependant pas rencontrer de problème majeur durant son
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/cooklists/base-apps.cooklist
--- a/examples/cooklists/base-apps.cooklist	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-bc
-zlib
-zlib-dev
-pcre
-pcre-dev
-e2fsprogs
-dropbear
-lighttpd
-iptables
-sqlite
-sqlite-dev
-libcap
-libcap-dev
-cdrkit
-cpio
-microperl
-module-init-tools
-ppp
-rsync
-tazpkg
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/cooklists/base-ncurses.cooklist
--- a/examples/cooklists/base-ncurses.cooklist	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-ncurses
-clex
-nano
-retawq
-htop
-dialog
-ninvaders
-bastet
-rhapsody
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/cooklists/base-system.cooklist
--- a/examples/cooklists/base-system.cooklist	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-slitaz-base-files
-busybox
-glibc-base
-linux
-syslinux
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/cooklists/gtk+.cooklist
--- a/examples/cooklists/gtk+.cooklist	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-cairo
-glib
-pango
-atk
-gtk+
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/cooklists/x-window.cooklist
--- a/examples/cooklists/x-window.cooklist	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-expat
-freetype
-fontconfig
-xorg-randrproto
-xorg-renderproto
-xorg-inputproto
-xorg-kbproto
-xorg-xcmiscproto
-xorg-xextproto
-xorg-xproto
-xorg-xtrans
-xorg-libXdmcp
-xorg-libX11
-xorg-libXrender
-xorg-libICE
-xorg-libSM
-xorg-libXau
-xorg-libXaw
-xorg-libXext
-xorg-libXft
-xorg-libXmu
-xorg-libXinerama
-xorg-libXp
-xorg-libXpm
-xorg-libXt
-xorg-libXcursor
-xorg-libXi
-xorg-libfontenc
-xorg-rgb
-xorg-xload
-xterm
-libpng
-jwm
-jpeg
-tiff
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/receipt
--- a/examples/receipt	Sun Feb 20 19:56:03 2011 +0100
+++ b/examples/receipt	Tue Feb 22 01:56:15 2011 +0100
@@ -13,12 +13,7 @@
 compile_rules()
 {
     cd $src
-    ./configure \
-    	--prefix=/usr \
-    	--infodir=/usr/share/info \
-    	--mandir=/usr/share/man \
-    	$CONFIGURE_ARGS &&
-    make -j 4 && make DESTDIR=$PWD/_pkg install
+    ./configure && make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 8ededfb1d957 -r 08c39bd8d068 examples/tazwok.conf
--- a/examples/tazwok.conf	Sun Feb 20 19:56:03 2011 +0100
+++ b/examples/tazwok.conf	Tue Feb 22 01:56:15 2011 +0100
@@ -120,7 +120,7 @@
 # but which are not in the core temporary toolchain.
 # Note : order is not important here.
 SLITAZ_TOOLCHAIN_EXTRA="tazpkg
-tazwok-experimental
+tazwok
 pkg-config
 libtool
 libpthread-stubs"
diff -r 8ededfb1d957 -r 08c39bd8d068 update-repository
--- a/update-repository	Sun Feb 20 19:56:03 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-if ! [ "$1" ]; then
-	echo "Usage: update-repository LOCAL_REPOSITORY (i.e.: /home/slitaz/experimental)"
-	exit
-fi
-
-WOK=$1/wok
-SOURCES_REPOSITORY=$1/src
-LOG_DIR=$1/log
-PACKAGES_REPOSITORY=$1/packages
-INCOMING_REPOSITORY=$1/packages-incoming
-
-if [ -d "$WOK" ] && [ -d "$SOURCES_REPOSITORY" ] && [ -d "$LOG_DIR" ] && \
-	[ -d "$PACKAGES_REPOSITORY" ] && [ -d "$INCOMING_REPOSITORY" ]; then
-	rm -f $SOURCES_REPOSITORY/sources.list
-else
-	echo "$1 doesn't looks like a LOCAL_REPOSITORY: it doesn't contains one or several of theses directories:
-	* $WOK
-	* $SOURCES_REPOSITORY
-	* $PACKAGES_REPOSITORY
-	* $INCOMING_REPOSITORY
-	* $LOG_DIR"
-	exit
-fi
-
-echo "Updating logs files..."
-cd $LOG_DIR
-for i in *.html; do
-	sed 's~file:///usr/share/slitaz/web~web~' -i $i
-done
-[ -L web ] || ln -s /usr/share/slitaz/web web
-echo "Update done: you can now use 'tazwok webserver on' to add you're repository to webinterface.
-If you use the path by default, it will be available at: http://localhost/vhosts/bb
-This command need lighttpd & php installed to be used."
-
-echo "
-Changing sources pathes according new changes into tazwok-experimental and generating $SOURCES_REPOSITORY/sources.list."
-cd $WOK
-for i in *; do
-	unset PACKAGE SOURCE VERSION WGET_URL TARBALL
-	source $i/receipt
-	[ "$WGET_URL" ] || continue
-	# Check that source is at the good location; if not move it or remove it if it's a duplicate.
-	if [ "$SOURCE" ]; then
-		if [ -f "$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma" ]; then
-			if [ -f "$SOURCES_REPOSITORY/$SOURCE-$VERSION.tar.lzma" ]; then
-				rm $SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma
-			else
-				mv $SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma $SOURCES_REPOSITORY/$SOURCE-$VERSION.tar.lzma
-			fi
-		fi
-	fi
-	if grep -q "^$PACKAGE | $VERSION" $PACKAGES_REPOSITORY/packages.desc; then
-		main_version="$VERSION"
-		if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then
-			echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $SOURCES_REPOSITORY/sources.list
- 		elif [ -f "SOURCES_REPOSITORY/$TARBALL" ]; then
-			echo -e "$PACKAGE:main\t$TARBALL" >> $SOURCES_REPOSITORY/sources.list
-		fi
-	else
-		# May not works if package use extraversion.
-		main_version=$(grep -m1 -A1 -sh ^$PACKAGE$ $PACKAGES_REPOSITORY/packages.txt | tail -1 | sed 's/ *//')
-		if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$main_version.tar.lzma ]; then
-			echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-$main_version.tar.lzma" >> $SOURCES_REPOSITORY/sources.list
-		else
-			unset main_version
-		fi
-	fi
-	if [ ! "$main_version" ] || grep -q "^$PACKAGE | $VERSION" $INCOMING_REPOSITORY/packages.desc; then
-		if [ -f $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then
-			echo -e "$PACKAGE:incoming\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $SOURCES_REPOSITORY/sources.list
- 		elif [ -f "SOURCES_REPOSITORY/$TARBALL" ]; then
-			echo -e "$PACKAGE:incoming\t$TARBALL" >> $SOURCES_REPOSITORY/sources.list
-		fi
-	fi
-done
-echo "Done."
-echo "
-You can check/purge old sources tarball and sources tarball unrelated to wok receipts using 'tazwok clean-src'"
diff -r 8ededfb1d957 -r 08c39bd8d068 web/index.php
--- a/web/index.php	Sun Feb 20 19:56:03 2011 +0100
+++ b/web/index.php	Tue Feb 22 01:56:15 2011 +0100
@@ -92,7 +92,7 @@
 	<div id="block_top">
 		<h1>Build Bot</h1>
 		<p>
-			Tazwok-experimental is a <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
+			Tazwok is a <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
 			Build Bot, it automatically cooks and tests packages commited in
 			the wok. SliTaz <a href="http://pkgs.slitaz.org/">packages</a> are
 			cooked on the project main server: code name