# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1397787076 -7200
# Node ID 9500b841a5965add0b5e31d392a338d6115f67e3
# Parent  c1523f23716a01a1195d498fef92c3715136fcd3
slitaz-*-configs*: Update receipt

diff -r c1523f23716a -r 9500b841a596 slitaz-arm-codex/receipt
--- a/slitaz-arm-codex/receipt	Fri Apr 18 01:43:00 2014 +0200
+++ b/slitaz-arm-codex/receipt	Fri Apr 18 04:11:16 2014 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-arm-codex"
-VERSION="0.1"
+VERSION="0.2"
 CATEGORY="base-system"
 SHORT_DESC="Static HTML5 SliTaz ARM Codex."
 MAINTAINER="pankso@slitaz.org"
@@ -18,6 +18,8 @@
 	mkdir -p ${doc}/images
 	cp ${src}/arm/codex/*.html ${doc}
 	cp ${src}/arm/style.css ${doc}
+	cp ${src}/arm/style-tiny.css ${doc}
 	cp ${src}/arm/images/logo.png ${doc}/images
+	cp ${src}/arm/images/arm.png ${doc}/images
 	cp ${src}/arm/images/raspberrypi.png ${doc}/images
 }
diff -r c1523f23716a -r 9500b841a596 slitaz-arm-rpi/receipt
--- a/slitaz-arm-rpi/receipt	Fri Apr 18 01:43:00 2014 +0200
+++ b/slitaz-arm-rpi/receipt	Fri Apr 18 04:11:16 2014 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-arm-rpi"
-VERSION="0.2"
+VERSION="0.3"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz Raspberry Pi: tools, CGI adm, configs and artwork."
 MAINTAINER="pankso@slitaz.org"
diff -r c1523f23716a -r 9500b841a596 slitaz-configs-base/receipt
--- a/slitaz-configs-base/receipt	Fri Apr 18 01:43:00 2014 +0200
+++ b/slitaz-configs-base/receipt	Fri Apr 18 04:11:16 2014 +0200
@@ -29,11 +29,6 @@
 			# are common to all arch.
 			mkdir -p $fs/usr/share $fs/etc
 			cp -a $src/rootfs/usr/bin $fs/usr 
-			cp -a $src/rootfs/usr/share/webhome $fs/usr/share
-			cp -a $src/rootfs/usr/share/applications $fs/usr/share 
-			cp -a $src/rootfs/usr/share/pixmaps $fs/usr/share 
-			cp -a $src/rootfs/usr/share/themes $fs/usr/share
-			cp -a $src/rootfs/usr/share/slitaz $fs/usr/share 
 			cp -a $src/rootfs/etc/lxpanel $fs/etc 
 			cp -a $src/rootfs/etc/skel $fs/etc ;;
 		*)
@@ -44,12 +39,12 @@
 				$fs/etc/skel/Music \
 				$fs/etc/skel/Documents
 			cp -a $src/rootfs/boot $fs
-			cp -a $src/rootfs/etc/skel $fs/etc
-			
-			for i in images pixmaps themes webhome; do
-				cp -r $src/rootfs/usr/share/$i $fs/usr/share
-			done ;;
+			cp -a $src/rootfs/etc/skel $fs/etc ;;
 	esac
+	
+	for i in images pixmaps themes webhome; do
+		cp -r $src/rootfs/usr/share/$i $fs/usr/share
+	done
 
 	cp -a $src/rootfs/root $fs
 	chown -R root.root $fs
diff -r c1523f23716a -r 9500b841a596 slitaz-configs/receipt
--- a/slitaz-configs/receipt	Fri Apr 18 01:43:00 2014 +0200
+++ b/slitaz-configs/receipt	Fri Apr 18 04:11:16 2014 +0200
@@ -2,7 +2,6 @@
 
 PACKAGE="slitaz-configs"
 VERSION="5.4"
-ARM_VERS="0.3"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files and artwork."
 MAINTAINER="pankso@slitaz.org"
@@ -10,7 +9,6 @@
 WEB_SITE="http://www.slitaz.org/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz"
-CONFIG_FILES="/etc/slitaz/applications.conf"
 HOST_ARCH="i486 arm"
 
 DEPENDS="slitaz-configs-base xorg-libXcomposite xorg-libXdamage \
@@ -19,19 +17,8 @@
 # Special case for ARM since some (most) config files are in slitaz-arm repo.
 # i486/arm common configs are provided by slitaz-configs-base.
 case "$SLITAZ_ARCH" in
-	arm*)
-		VERSION="$ARM_VERS"
-		WEB_SITE="http://arm.slitaz.org/"
-		DEPENDS="slitaz-configs-base ttf-dejavu slim" 
-		CONFIG_FILES="/etc/slitaz/applications.conf /etc/rcS.conf" ;;
-esac
-
-case "$ARCH" in
-	arm*)
-		VERSION="$ARM_VERS"
-		WEB_SITE="http://arm.slitaz.org/"
-		TARBALL="$PACKAGE-arm-$VERSION.tar.bz2"
-		WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/tip.tar.bz2" ;;
+	i?86) CONFIG_FILES="/etc/slitaz/applications.conf" ;;
+	i?86) DEPENDS="$DEPENDS slitaz-arm-configs" ;;
 esac
 
 # Rules to configure and make the package.
@@ -59,14 +46,16 @@
 			do
 				cp -r $src/rootfs/usr/share/$i $fs/usr/share
 			done
-		
 			cp -a $src/rootfs/usr/bin $fs/usr
 			cp -a $src/rootfs/etc/lxpanel $fs/etc
 			cp -a $src/rootfs/etc/slitaz $fs/etc
-			cp -a $install/etc/xdg/openbox/menu.en.xml $install/etc/xdg/openbox/menu.xml \
+			cp -a $install/etc/xdg/openbox/menu.en.xml \
+				$install/etc/xdg/openbox/menu.xml \
 				$fs/etc/xdg/openbox ;;
 		arm)
-			cp -a rootfs/* ${fs} ;;
+			mkdir -p $fs/usr/share
+			cp -a $src/rootfs/usr/share/applications $fs/usr/share
+			cp -a $src/rootfs/usr/share/slitaz $fs/usr/share ;;
 	esac
 	chown -R root.root $fs
 }