# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1329774659 18000
# Node ID a91f4b450f796cd680e6ce4d96e1bf4f3c5e81b2
# Parent  3a1ba78e55ca67405c794cb4c2ae1c14bd15e527
Up: emacs to 23.4 again. I think it maybe fix from my last commit.

diff -r 3a1ba78e55ca -r a91f4b450f79 emacs-help/receipt
--- a/emacs-help/receipt	Mon Feb 20 14:11:54 2012 -0500
+++ b/emacs-help/receipt	Mon Feb 20 16:50:59 2012 -0500
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="emacs-help"
-VERSION="23.3"
+VERSION="23.4"
 CATEGORY="development"
 SHORT_DESC="The GNU Emacs editor - Help files"
 MAINTAINER="domcox@slitaz.org"
@@ -14,23 +14,23 @@
 {
 	# Help files
 	echo -n "Copying info files"
-	mkdir -p $fs/usr/share/emacs/info && \
-	cp -a $_pkg/usr/share/emacs/info/em* $fs/usr/share/emacs/info && \
-	cp -a $_pkg/usr/share/emacs/info/info $fs/usr/share/emacs/info
+	mkdir -p $fs/usr/share/info && \
+	cp -a $_pkg/usr/share/info/em* $fs/usr/share/info && \
+	cp -a $_pkg/usr/share/info/info $fs/usr/share/info
 	status
 	# Tutorial
 	echo -n "Copying tutorial files"
-	mkdir -p $fs/usr/share/emacs/$VERSION/etc && \
-	cp -a $_pkg/usr/share/emacs/$VERSION/etc/tutorials $fs/usr/share/emacs/$VERSION/etc
+	mkdir -p $fs/usr/share/emacs/${VERSION:0:4}/etc && \
+	cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/tutorials $fs/usr/share/emacs/${VERSION:0:4}/etc
 	status
 	# Doc
 	echo -n "Copying doc files"
-	DOC_FILES="	COOKIES DOC-$VERSION.1 DEVEL.HUMOR ERC-NEWS ETAGS.EBNF GNUS-NEWS HELLO \
+	DOC_FILES="	COOKIES DOC-${VERSION:0:4}.1 DEVEL.HUMOR ERC-NEWS ETAGS.EBNF GNUS-NEWS HELLO \
 				INTERVIEW JOKES LINUX-GNU MH-E-NEWS MORE.STUFF MOTIVATION NEWS NEWS.1-17 \
 				NEWS.19 NEWS.19 NEWS.20 NEWS.21 NEWS.22 NXML-NEWS PROBLEMS TERMS THE-GNU-PROJECT \
 				WHY-FREE compilation.txt enriched.doc gnus-tut.txt grep.txt"
 	for file in $DOC_FILES; do
-		cp -a $_pkg/usr/share/emacs/$VERSION/etc/$file $fs/usr/share/emacs/$VERSION/etc
+		cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/$file $fs/usr/share/emacs/${VERSION:0:4}/etc
 	done
 	status
 }
diff -r 3a1ba78e55ca -r a91f4b450f79 emacs-lisp-sources/receipt
--- a/emacs-lisp-sources/receipt	Mon Feb 20 14:11:54 2012 -0500
+++ b/emacs-lisp-sources/receipt	Mon Feb 20 16:50:59 2012 -0500
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="emacs-lisp-sources"
-VERSION="23.3"
+VERSION="23.4"
 CATEGORY="development"
 SHORT_DESC="The GNU Emacs editor - Lisp source files"
 MAINTAINER="domcox@slitaz.org"
@@ -21,31 +21,31 @@
 
 	for dir in $LISP_DIR; do
 		echo -n "Copying $dir sources"
-		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
-		cp $_pkg/usr/share/$WANTED/$VERSION/$dir/*.el.gz $fs/usr/share/$WANTED/$VERSION/$dir
+		mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
+		cp $_pkg/usr/share/$WANTED/${VERSION:0:4}/$dir/*.el.gz $fs/usr/share/$WANTED/${VERSION:0:4}/$dir
 		status
 	done
 	# Use linux term only
 	LINUX_TERM="rxvt.el.gz tty-colors.el.gz vt100.el.gz xterm.el.gz"
 	echo -n "Copying lisp/term sources"
-	mkdir -p $fs/usr/share/$WANTED/$VERSION/lisp/term && \
+	mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/lisp/term && \
 	for file in $LINUX_TERM; do
-		cp -a $_pkg/usr/share/$WANTED/$VERSION/lisp/term/$file $fs/usr/share/$WANTED/$VERSION/lisp/term
+		cp -a $_pkg/usr/share/$WANTED/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$WANTED/${VERSION:0:4}/lisp/term
 	done
 	status
 	# leim files
 	LEIM_FILES="leim/ja-dic leim/quail"
 	for dir in $LEIM_FILES; do
 		echo -n "Copying $dir sources"
-		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
-		cp $_pkg/usr/share/$WANTED/$VERSION/$dir/*.el.gz $fs/usr/share/$WANTED/$VERSION/$dir && \
+		mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
+		cp $_pkg/usr/share/$WANTED/${VERSION:0:4}/$dir/*.el.gz $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
 		status
 	done
 	# Doc
 	echo -n "Copying doc files"
 	DOC_FILES="CONTRIBUTE DEBUG MACHINES MAILINGLISTS TODO"
 	for file in $DOC_FILES; do
-		cp -a $_pkg/usr/share/emacs/$VERSION/etc/$file $fs/usr/share/emacs/$VERSION/etc
+		cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/$file $fs/usr/share/emacs/${VERSION:0:4}/etc
 	done
 	status
 }
diff -r 3a1ba78e55ca -r a91f4b450f79 emacs/receipt
--- a/emacs/receipt	Mon Feb 20 14:11:54 2012 -0500
+++ b/emacs/receipt	Mon Feb 20 16:50:59 2012 -0500
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="emacs"
-VERSION="23.3"
+VERSION="23.4"
 CATEGORY="development"
 SHORT_DESC="The GNU Emacs editor"
 MAINTAINER="domcox@slitaz.org"
@@ -25,7 +25,7 @@
 	sed -i 's/${GZIP_PROG} -9n/${GZIP_PROG}/g' leim/Makefile.in
 	# Configure (with GCC 4.5.0 workaround)
 	CFLAGS="-g -O2 -fno-optimize-sibling-calls" ./configure $CONFIGURE_ARGS \
-		--infodir=/usr/share/emacs/info \
+		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--without-makeinfo \
 		--without-gconf \
@@ -38,7 +38,7 @@
 		--sharedstatedir=/var/lib \
 		--prefix=/usr && \
 	make $MAKEFLAGS && \
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -56,7 +56,7 @@
 	echo -n "Copying emacs lib files"
 	cp -a $_pkg/usr/lib $fs/usr
 	status
-	strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null
+	strip -s $fs/usr/lib/$PACKAGE/${VERSION:0:4}/i486-pc-linux-gnu/* 2> /dev/null
 	# lisp files
 	LISP_DIR="	lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede lisp/cedet/semantic \
 				lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine lisp/cedet/semantic/decorate \
@@ -65,14 +65,14 @@
 				lisp/net lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes lisp/url"
 	for dir in $LISP_DIR; do
 		echo -n "Copying $dir files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
-		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir
-		if [ `ls $_pkg/usr/share/$PACKAGE/$VERSION/$dir/ | grep -c \.el$` -gt 0 ]; then
-			cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.el $fs/usr/share/$PACKAGE/$VERSION/$dir
+		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
+		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
+		if [ `ls $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/ | grep -c \.el$` -gt 0 ]; then
+			cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
 		fi
 		for file in COPYING README TODO; do
-			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
+			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
+				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
 			fi
 		done
 		status
@@ -80,24 +80,24 @@
 	# Use linux term only
 	LINUX_TERM="README linux.el rxvt.elc tty-colors.elc vt100.elc xterm.elc"
 	echo -n "Copying lisp/term files (linux only)"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \
+	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term && \
 	for file in $LINUX_TERM; do
-		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/lisp/term/$file $fs/usr/share/$PACKAGE/$VERSION/lisp/term
+		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term
 	done
 	status
 	# leim files
 	echo -n "Copying leim files"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/leim && \
-	cp $_pkg/usr/share/$PACKAGE/$VERSION/leim/*.el $fs/usr/share/$PACKAGE/$VERSION/leim
+	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim && \
+	cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/leim/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim
 	status
 	LEIM_FILES="leim/ja-dic leim/quail"
 	for dir in $LEIM_FILES; do
 		echo -n "Copying $dir files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
-		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir && \
+		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
+		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
 		for file in COPYING README TODO; do
-			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
+			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
+				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
 			fi
 		done
 		status
@@ -107,9 +107,9 @@
 	CONF_FILES="ETAGS.README charsets e edt-user.el emacs2.py emacs3.py emacs-buffer.gdb emacs.py \
 				forms-d2.dat gnus nxml schema enriched.doc ms-kermit ps-prin0.ps ps-prin1.ps \
 				ses-example.ses spook.lines yow.lines"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \
+	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc && \
 	for file in $CONF_FILES; do
-		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
+		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
 	done
 	status
 	# Pixmaps files
@@ -118,11 +118,11 @@
 				images/tree-widget/folder"
 	for dir in $XPM_DIR; do
 		echo -n "Copying $dir xpm files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
-		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
+		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
+		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
 		for file in COPYING README TODO; do
-			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
+			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
+				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
 			fi
 		done
 		status
@@ -130,37 +130,37 @@
 	PNG_DIR="	images images/gnus images/tree-widget/default images/tree-widget/folder"
 	for dir in $PNG_DIR; do
 		echo -n "Copying $dir png files"
-		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
+		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.png $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
 		status
 	done
 	# Licence
 	GNU_FILES="AUTHORS BABYL CENSORSHIP COPYING DISTRIB FTP GNU ORDERS SERVICE copying.paper"
 	echo -n "Copying License files"
 	for file in $GNU_FILES; do
-		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
+		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
 	done
 	status
 	# Install specific site file
 	echo -n "Installing specific SliTaz file"
 	mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
 	cp -a $_pkg/usr/share/$PACKAGE/site-lisp $fs/usr/share/$PACKAGE && \
-	cp -a stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
-	cp -a stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
+	cp -a $stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
+	cp -a $stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
 	status
 	# Install desktop files for emacs
 	echo -n "Installing emacs menu"
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \
-	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/ && \
+	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/ && \
 	cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/emacs.png $fs/usr/share/pixmaps
 	status
 	# Add a desktop file for emacs client
 	echo -n "Installing emacsclient menu"
-	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
+	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
 	sed -i 's/Exec.*/Exec=xterm -e emacsclient --alternate-editor="" %F/' $fs/usr/share/applications/emacsclient.desktop && \
 	sed -i 's/Name=.*/Name=Emacsclient/' $fs/usr/share/applications/emacsclient.desktop
 	status
 	# Directory  workaround
-	cd $fs/usr/share/$PACKAGE/$VERSION
+	cd $fs/usr/share/$PACKAGE/${VERSION:0:4}
 	ln -s ../site-lisp site-lisp
 }