wok-current rev 12691

Up: slitaz-tools (5.0)
author Christophe Lincoln <pankso@slitaz.org>
date Wed May 02 16:12:14 2012 +0200 (2012-05-02)
parents d56a83bbe31d
children c4a1d70d3b9d
files slitaz-tools-boxes/receipt slitaz-tools/receipt
line diff
     1.1 --- a/slitaz-tools-boxes/receipt	Wed May 02 15:03:20 2012 +0200
     1.2 +++ b/slitaz-tools-boxes/receipt	Wed May 02 16:12:14 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slitaz-tools-boxes"
     1.7 -VERSION="4.9.1"
     1.8 +VERSION="5.0"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="All SliTaz GTKdialog boxes to command line tools."
    1.11  MAINTAINER="pankso@slitaz.org"
     2.1 --- a/slitaz-tools/receipt	Wed May 02 15:03:20 2012 +0200
     2.2 +++ b/slitaz-tools/receipt	Wed May 02 16:12:14 2012 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="slitaz-tools"
     2.7 -VERSION="4.9.1"
     2.8 +VERSION="5.0"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="SliTaz tools provide installer and utils usable on termnial."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 @@ -14,7 +14,6 @@
    2.13  CONFIG_FILES="
    2.14  /etc/TZ
    2.15  /etc/keymap.conf
    2.16 -/etc/X11/screen.conf
    2.17  /etc/locale.conf
    2.18  /etc/firewall.conf
    2.19  /etc/slitaz/applications.conf"
    2.20 @@ -24,7 +23,8 @@
    2.21  {
    2.22      cd $src
    2.23  	# temp tazinst patch (until next release)
    2.24 -	patch -p1 < $stuff/tazinst.patch || return 1
    2.25 +	# Must stay in stable since tools <5.0 are not compaible 4.0.
    2.26 +	#patch -p1 < $stuff/tazinst.patch || return 1
    2.27      make && make DESTDIR=$DESTDIR install
    2.28  }
    2.29  
    2.30 @@ -33,6 +33,10 @@
    2.31  {
    2.32  	mkdir -p $fs
    2.33  	cp -a $install/* $fs
    2.34 +
    2.35 +	# Makefile bug in 5.0
    2.36 +	cp -a $src/tinyutils/decode $fs/usr/bin
    2.37 +
    2.38  	chmod 0644 $fs/usr/share/locale/*/*/*.mo
    2.39  	chown -R root.root $fs
    2.40  }
    2.41 @@ -46,7 +50,6 @@
    2.42  	echo "Creating backups of configs..."
    2.43  	cp $root/etc/TZ $root/etc/TZ.bak 2>/dev/null
    2.44  	cp $root/etc/keymap.conf $root/etc/keymap.conf.bak 2>/dev/null
    2.45 -	cp $root/etc/X11/screen.conf $root/etc/X11/screen.conf.bak 2>/dev/null
    2.46  	cp $root/etc/locale.conf $root/etc/locale.conf.bak 2>/dev/null
    2.47  	cp $root/etc/firewall.conf $root/etc/firewall.conf.bak 2>/dev/null
    2.48  }
    2.49 @@ -57,11 +60,6 @@
    2.50  	echo "Restoring configs backups..."
    2.51  	mv -f $root/etc/TZ.bak $root/etc/TZ 2>/dev/null
    2.52  	mv -f $root/etc/keymap.conf.bak $root/etc/keymap.conf 2>/dev/null
    2.53 -	mv -f $root/etc/X11/screen.conf.bak $root/etc/X11/screen.conf 2>/dev/null
    2.54  	mv -f $root/etc/locale.conf.bak $root/etc/locale.conf 2>/dev/null
    2.55  	mv -f $root/etc/firewall.conf.bak $root/etc/firewall.conf 2>/dev/null
    2.56 -	# Install boxes package if old slitaz-tools
    2.57 -	if [ -f $root/usr/bin/mountbox ] && [ ! -d /var/lib/tazpkg/installed/slitaz-tools-boxes ]; then
    2.58 -		tazpkg get-install slitaz-tools-boxes
    2.59 -	fi
    2.60  }