SliTaz Repositories

     1.1 --- a/.hgtags	Thu Apr 07 21:11:05 2011 +0200
     1.2 +++ b/.hgtags	Wed May 04 13:01:48 2011 +0000
     1.3 @@ -27,3 +27,4 @@
     1.4  5092d208347191bb10a8f1a9d5412b5f451305e4 4.2.10
     1.5  a99465ca9b36dc10eaf8ca255306f2a78f4deb5a 4.2.11
     1.6  ada9fd93793699e4858c3102a7110bedb5e86710 4.2.12
     1.7 +621bcc0de8ca7e029c7ca34060786f4cf8fba0f9 4.2.13

     2.1 --- a/applications/tazwok-doc.desktop	Thu Apr 07 21:11:05 2011 +0200
     2.2 +++ b/applications/tazwok-doc.desktop	Wed May 04 13:01:48 2011 +0000
     2.3 @@ -3,7 +3,7 @@
     2.4  Name[fr]=Manuel de Tazwok
     2.5  Comment=SliTaz packages builder manual
     2.6  Comment[fr]=Manuel du générateur de paquets SliTaz
     2.7 -Exec=browser /usr/share/doc/tazwok/tazwok.html
     2.8 +Exec=browser file:///usr/share/doc/tazwok/tazwok.html
     2.9  Icon=text-html
    2.10  Type=Application
    2.11  Categories=Documentation;

     3.1 --- a/chroot-scripts/cook-toolchain	Thu Apr 07 21:11:05 2011 +0200
     3.2 +++ b/chroot-scripts/cook-toolchain	Wed May 04 13:01:48 2011 +0000
     3.3 @@ -67,7 +67,8 @@
     3.4  	tazwok clean $PACKAGE
     3.5  	tazwok get-src $PACKAGE
     3.6  	unset SOURCE VERSION EXTRAVERSION CATEGORY SHORT_DESC \
     3.7 -		MAINTAINER WEB_SITE WGET_URL DEPENDS BUILD_DEPENDS WANTED
     3.8 +		MAINTAINER WEB_SITE WGET_URL DEPENDS BUILD_DEPENDS WANTED \
     3.9 +		stuff wanted_stuff
    3.10  	. $WOK/$PACKAGE/receipt
    3.11  	src=$WOK/$PACKAGE/$PACKAGE-$VERSION
    3.12  	stuff=$WOK/$PACKAGE/stuff

     4.1 --- a/chroot-scripts/tank-bot	Thu Apr 07 21:11:05 2011 +0200
     4.2 +++ b/chroot-scripts/tank-bot	Wed May 04 13:01:48 2011 +0000
     4.3 @@ -10,7 +10,12 @@
     4.4  . /etc/slitaz/tazwok.conf
     4.5  LOCAL_REPOSITORY="$SLITAZ_DIR/${undigest:-$SLITAZ_VERSION}"
     4.6  cd $LOCAL_REPOSITORY/flavors
     4.7 -hg pull -u
     4.8 +if [ ! -d .hg ]; then
     4.9 +	[ "$SLITAZ_VERSION" == "cooking" ] && hg clone http://hg.slitaz.org/flavors .
    4.10 +	[ "$SLITAZ_VERSION" == "stable" ] && hg clone http://hg.slitaz.org/flavors-stable .
    4.11 +else
    4.12 +	hg pull -u
    4.13 +fi
    4.14  clean-chroot
    4.15  
    4.16  tazwok cook-commit --missing

     5.1 --- a/tazwok	Thu Apr 07 21:11:05 2011 +0200
     5.2 +++ b/tazwok	Wed May 04 13:01:48 2011 +0000
     5.3 @@ -286,6 +286,21 @@
     5.4  	fi
     5.5  }
     5.6  
     5.7 +<<<<<<< local
     5.8 +=======
     5.9 +check_for_pkg_in_wok()
    5.10 +{
    5.11 +	[ -f $WOK/$PACKAGE/receipt ] && return
    5.12 +	if [ "$undigest" ]; then
    5.13 +		[ -f "$SLITAZ_DIR/$SLITAZ_VERSION/wok/$PACKAGE/receipt" ] && return 1
    5.14 +		grep -q ^$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages/packages.txt && return 1
    5.15 +	fi
    5.16 +	[ -f $WOK/$(whoprovide $PACKAGE)/receipt ] && return 1
    5.17 +	echo "Can't find $PACKAGE in wok or mirror" >&2
    5.18 +	return 2
    5.19 +}
    5.20 +
    5.21 +>>>>>>> other
    5.22  ########################################################################
    5.23  # TAZWOK CORE FUNCTIONS
    5.24  ########################
    5.25 @@ -978,12 +993,13 @@
    5.26  	report end-step
    5.27  }
    5.28  
    5.29 -# Remove .pyc and .pyo files from packages.
    5.30 +# Remove .pyc, .pyo and perllocal.pod files from packages.
    5.31  py_compiled_files_remove()
    5.32  {
    5.33 -	report step "Removing all .pyc and .pyo files from package"
    5.34 +	report step "Removing all .pyc, .pyo, and perllocal.pod files from package"
    5.35  	find $fs -type f -name "*.pyc" -delete 2>/dev/null
    5.36  	find $fs -type f -name "*.pyo" -delete 2>/dev/null
    5.37 +	find $fs -type f -name "perllocal.pod" -delete 2>/dev/null
    5.38  	report end-step
    5.39  }
    5.40  
    5.41 @@ -2211,6 +2227,8 @@
    5.42  		[ -L /home/slitaz/flavors ] && rm /home/slitaz/flavors
    5.43  		mkdir -p /home/slitaz
    5.44  		ln -s $LOCAL_REPOSITORY/flavors /home/slitaz/flavors
    5.45 +		cd /home/slitaz/flavors
    5.46 +		[ -d .hg ] && hg pull -u
    5.47  
    5.48  		cd $LOCAL_REPOSITORY/packages
    5.49  		for i in $LOCAL_REPOSITORY/flavors/*; do

     6.1 --- a/web/index.php	Thu Apr 07 21:11:05 2011 +0200
     6.2 +++ b/web/index.php	Wed May 04 13:01:48 2011 +0000
     6.3 @@ -81,7 +81,7 @@
     6.4  <div class="block">
     6.5  	<!-- Nav block begin -->
     6.6  	<div id="block_nav">
     6.7 -		<h3><img src="pics/website/development.png" alt="" />Developers</h3>
     6.8 +		<h3><img src="images/development.png" alt="" />Developers</h3>
     6.9  		<ul>
    6.10  			<li><a href="http://www.slitaz.org/en/devel/">Website/devel</a></li>
    6.11  			<li><a href="http://labs.slitaz.org/">Laboratories</a></li>
    6.12 @@ -292,7 +292,7 @@
    6.13  		<li><a href="http://www.slitaz.org/netmap.php">Network Map</a></li>
    6.14  		<li>Page modified the <?php echo (date( "d M Y", getlastmod())); ?></li>
    6.15  		<li><a href="http://validator.w3.org/check?uri=referer"><img
    6.16 -		src="pics/website/xhtml10.png" alt="Valid XHTML 1.0"
    6.17 +		src="images/xhtml10.png" alt="Valid XHTML 1.0"
    6.18  		title="Code validé XHTML 1.0"
    6.19  		style="width: 80px; height: 15px; vertical-align: middle;" /></a></li>
    6.20  	</ul>