--- erlang-10.b.1a.orig/lib/asn1/c_src/Makefile.in
+++ erlang-10.b.1a/lib/asn1/c_src/Makefile.in
@@ -74,7 +74,7 @@
 EI_INCLUDES = -I$(ERL_TOP)/lib/erl_interface/include
 DRIVER_INCLUDES = -I$(ERL_TOP)/erts/emulator/beam \
 	-I$(ERL_TOP)/erts/emulator/sys/$(ERLANG_OSTYPE)
-CFLAGS = $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@
+CFLAGS = -fPIC $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@
 LDFLAGS = @DED_LDFLAGS@
 
 LD_INCL_EI = -L$(EI_LIBDIR)
--- erlang-10.b.1a.orig/lib/crypto/c_src/Makefile.in
+++ erlang-10.b.1a/lib/crypto/c_src/Makefile.in
@@ -56,7 +56,7 @@
 TYPE_FLAGS = -O2
 endif
 
-ALL_CFLAGS = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(INCLUDES)
+ALL_CFLAGS = @CFLAGS@ @DEFS@ -fPIC $(TYPE_FLAGS) $(INCLUDES)
 
 # ----------------------------------------------------
 # Release directory specification
@@ -121,7 +121,7 @@
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
+	$(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj
 	$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj
 	$(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib
 
--- erlang-10.b.1a.orig/lib/erl_interface/src/auxdir/config.guess
+++ erlang-10.b.1a/lib/erl_interface/src/auxdir/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-10-21'
+timestamp='2004-03-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -98,14 +98,18 @@
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -178,18 +180,35 @@
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -208,6 +227,9 @@
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -223,71 +245,70 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -310,6 +331,9 @@
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -327,6 +351,9 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -399,6 +426,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -439,8 +469,7 @@
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
@@ -449,7 +478,7 @@
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
 	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS)
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -524,8 +553,7 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -624,10 +652,20 @@
               }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -661,8 +699,7 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -720,21 +757,26 @@
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -756,8 +798,10 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -768,14 +812,17 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
 	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
+	echo i586-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -787,17 +834,28 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -818,8 +876,26 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -855,6 +931,9 @@
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -912,9 +991,11 @@
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -932,6 +1013,26 @@
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -966,9 +1067,6 @@
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -995,9 +1093,12 @@
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
 	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1014,9 +1115,6 @@
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1098,7 +1196,11 @@
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1111,7 +1213,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1134,11 +1236,6 @@
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1157,11 +1254,11 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
 esac
 
@@ -1283,8 +1380,7 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
--- erlang-10.b.1a.orig/lib/erl_interface/src/auxdir/config.sub
+++ erlang-10.b.1a/lib/erl_interface/src/auxdir/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-09-05'
+timestamp='2004-03-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -228,14 +229,15 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -245,21 +247,24 @@
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
 	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -294,7 +299,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -302,8 +307,8 @@
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -315,21 +320,26 @@
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
 	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39 | mipstx39el \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -353,6 +363,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -367,6 +380,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -426,12 +445,20 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -716,6 +743,10 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -727,6 +758,10 @@
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -758,18 +793,24 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -828,6 +869,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -835,6 +880,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -901,10 +949,6 @@
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -913,14 +957,18 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -934,6 +982,10 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -977,10 +1029,6 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1027,13 +1075,13 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1106,18 +1154,20 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1129,8 +1179,10 @@
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1139,6 +1191,9 @@
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1151,6 +1206,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1172,6 +1230,9 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1194,6 +1255,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1224,6 +1288,12 @@
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-none)
 		;;
 	*)
@@ -1255,6 +1325,9 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1433,9 +1506,15 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- erlang-10.b.1a.orig/lib/erl_interface/src/Makefile.in
+++ erlang-10.b.1a/lib/erl_interface/src/Makefile.in
@@ -95,7 +95,7 @@
 ifneq ($(findstring ose,$(TARGET)),ose)
 CFLAGS = @DED_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS)
 else
-CFLAGS = @CFLAGS@ $(INCFLAGS)
+CFLAGS = -fPIC @CFLAGS@ $(INCFLAGS)
 endif
 PROG_CFLAGS = @CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) -Ilegacy
 
--- erlang-10.b.1a.orig/lib/ic/c_src/Makefile.in
+++ erlang-10.b.1a/lib/ic/c_src/Makefile.in
@@ -110,7 +110,7 @@
 
 OBJ_FILES= $(C_FILES:%.c=$(OBJDIR)/%.o) 
 
-ALL_CFLAGS = @CFLAGS@ @DEFS@ -I$(INCDIR) $(ERL_INTERFACE_FLAGS) $(CFLAGS) 
+ALL_CFLAGS = -fPIC @CFLAGS@ @DEFS@ -I$(INCDIR) $(ERL_INTERFACE_FLAGS) $(CFLAGS) 
 
 # ----------------------------------------------------
 # Targets
--- erlang-10.b.1a.orig/lib/megaco/src/flex/Makefile.in
+++ erlang-10.b.1a/lib/megaco/src/flex/Makefile.in
@@ -146,7 +146,7 @@
 CFLAGS += -DMFS_DEBUG=true
 endif
 
-CFLAGS += $(DRIVER_INCLUDES) $(DRV_FLAGS) -funroll-loops -Wall 
+CFLAGS += -fPIC $(DRIVER_INCLUDES) $(DRV_FLAGS) -funroll-loops -Wall 
 
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER_LINENO),true)
 LEX_FLAGS = -Ca
--- erlang-10.b.1a.orig/lib/odbc/c_src/Makefile.in
+++ erlang-10.b.1a/lib/odbc/c_src/Makefile.in
@@ -82,7 +82,7 @@
 
 EIINCLUDE = $(EIROOT)/include
 INCLUDES = -I. -I$(EIINCLUDE) -I$(ODBCINCLUDE)
-CFLAGS = @CFLAGS32@
+CFLAGS = -fPIC @CFLAGS32@
 LDFLAGS += 
 CC = @CC32@
 
--- erlang-10.b.1a.orig/lib/orber/c_src/Makefile.in
+++ erlang-10.b.1a/lib/orber/c_src/Makefile.in
@@ -64,7 +64,7 @@
 TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
 OBJ_FILES= $(C_FILES:%.c=$(OBJDIR)/%.o) 
 
-ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS) 
+ALL_CFLAGS = -fPIC @CFLAGS@ @DEFS@ $(CFLAGS) 
 
 # ----------------------------------------------------
 # Targets
--- erlang-10.b.1a.orig/lib/os_mon/c_src/Makefile.in
+++ erlang-10.b.1a/lib/os_mon/c_src/Makefile.in
@@ -68,7 +68,7 @@
 
 TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
 
-ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS)
+ALL_CFLAGS = -fPIC @CFLAGS@ @DEFS@ $(CFLAGS)
 
 # ----------------------------------------------------
 # Targets
--- erlang-10.b.1a.orig/lib/runtime_tools/c_src/Makefile.in
+++ erlang-10.b.1a/lib/runtime_tools/c_src/Makefile.in
@@ -30,7 +30,7 @@
 # be set for that system only.
 # ----------------------------------------------------
 CC = @CC@
-CFLAGS = @DED_CFLAGS@ @THR_DEFS@
+CFLAGS = -fPIC @DED_CFLAGS@ @THR_DEFS@
 LD = @DED_LD@
 SHELL = /bin/sh
 LIBS = @LIBS@ @THR_LIBS@
--- erlang-10.b.1a.orig/lib/ssh/c_src/Makefile.in
+++ erlang-10.b.1a/lib/ssh/c_src/Makefile.in
@@ -56,7 +56,7 @@
 TYPE_FLAGS = -O2
 endif
 
-ALL_CFLAGS = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(INCLUDES)
+ALL_CFLAGS = -fPIC @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(INCLUDES)
 
 # ----------------------------------------------------
 # Release directory specification
--- erlang-10.b.1a.orig/lib/ssl/c_src/Makefile.in
+++ erlang-10.b.1a/lib/ssl/c_src/Makefile.in
@@ -44,7 +44,7 @@
 # Includes and libs
 # ----------------------------------------------------
 
-ALL_CFLAGS = @WFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
+ALL_CFLAGS = -fPIC @WFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
 TARGET = @host@
 
 ifeq ($(TYPE),debug)
--- erlang-10.b.1a.orig/erts/autoconf/config.guess
+++ erlang-10.b.1a/erts/autoconf/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-02-22'
+timestamp='2004-03-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,6 +106,7 @@
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -196,12 +197,18 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -220,6 +227,9 @@
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -235,10 +245,24 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -276,11 +300,15 @@
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -303,6 +331,9 @@
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -320,6 +351,9 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -392,6 +426,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -727,7 +764,7 @@
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -735,6 +772,11 @@
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -756,7 +798,10 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -767,8 +812,8 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -789,17 +834,28 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -873,7 +929,10 @@
 	echo hppa64-unknown-linux-gnu
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-gnu
+	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -932,6 +991,9 @@
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
@@ -962,6 +1024,9 @@
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1033,7 +1098,7 @@
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1148,7 +1213,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1189,6 +1254,12 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- erlang-10.b.1a.orig/erts/autoconf/config.sub
+++ erlang-10.b.1a/erts/autoconf/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-02-22'
+timestamp='2004-03-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -228,14 +229,15 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -247,6 +249,7 @@
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -259,9 +262,9 @@
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -304,8 +307,8 @@
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -319,6 +322,7 @@
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -332,7 +336,7 @@
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -359,6 +363,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -373,6 +380,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -432,12 +445,20 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -737,6 +758,10 @@
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -768,18 +793,24 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -838,6 +869,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -845,6 +880,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -919,10 +957,6 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -948,6 +982,10 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1043,7 +1081,7 @@
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1116,19 +1154,20 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1152,6 +1191,9 @@
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1164,6 +1206,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1185,6 +1230,9 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1207,6 +1255,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1274,6 +1325,9 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1452,9 +1506,15 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
--- erlang-10.b.1a.orig/erts/emulator/zlib/Makefile.in
+++ erlang-10.b.1a/erts/emulator/zlib/Makefile.in
@@ -17,7 +17,7 @@
 else
   TYPE_FLAGS = -O3
 endif
-CFLAGS = @CFLAGS@ @DEFS@ @THR_DEFS@ $(TYPE_FLAGS)
+CFLAGS = @CFLAGS@ @DEFS@ @THR_DEFS@ $(TYPE_FLAGS) -fPIC
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
 #CFLAGS=-g -DDEBUG
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
--- erlang-10.b.1a.orig/erts/emulator/Makefile.in
+++ erlang-10.b.1a/erts/emulator/Makefile.in
@@ -31,7 +31,7 @@
 PURIFY =
 TYPEMARKER = .debug
 THR_LIB_SFX = .debug
-TYPE_FLAGS = @DEBUG_CFLAGS@ -DDEBUG
+TYPE_FLAGS = @DEBUG_CFLAGS@ -fPIC -DDEBUG
 ENABLE_ALLOC_TYPE_VARS += debug
 ifeq ($(TARGET),win32)
 TYPE_FLAGS += -DNO_JUMP_TABLE
@@ -41,20 +41,20 @@
 ifeq ($(TYPE),shared)
 PURIFY =
 TYPEMARKER = .shared
-TYPE_FLAGS = @CFLAGS@ -DSHARED_HEAP
+TYPE_FLAGS = @CFLAGS@ -fPIC -DSHARED_HEAP
 ENABLE_ALLOC_TYPE_VARS += shared_heap
 else
 ifeq ($(TYPE),hybrid)
 PURIFY =
 TYPEMARKER = .hybrid
-TYPE_FLAGS = @CFLAGS@ -DHYBRID
+TYPE_FLAGS = @CFLAGS@ -fPIC -DHYBRID
 ENABLE_ALLOC_TYPE_VARS += hybrid
 else
 ifeq ($(TYPE),purify)
 PURIFY = purify $(PURIFY_BUILD_OPTIONS)
 TYPEMARKER = .purify
 THR_LIB_SFX = .purify
-TYPE_FLAGS = @CFLAGS@ -DPURIFY -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS
+TYPE_FLAGS = @CFLAGS@ -fPIC -DPURIFY -DNO_JUMP_TABLE -DERTS_MSEG_FAKE_SEGMENTS
 ENABLE_ALLOC_TYPE_VARS += purify
 else
 ifeq ($(TYPE),quantify)
@@ -63,22 +63,22 @@
 THR_LIB_SFX = .quantify
 ENABLE_ALLOC_TYPE_VARS += quantify
 ifeq ($(findstring ose,$(TARGET)),ose)
-  TYPE_FLAGS = @CFLAGS@ -DQUANTIFY
+  TYPE_FLAGS = @CFLAGS@ -fPIC -DQUANTIFY
 else
-  TYPE_FLAGS = @CFLAGS@ -g -O2 -DQUANTIFY -DNO_JUMP_TABLE
+  TYPE_FLAGS = @CFLAGS@ -fPIC -g -O2 -DQUANTIFY -DNO_JUMP_TABLE
 endif
 else
 ifeq ($(TYPE),purecov)
 PURIFY = purecov --follow-child-processes=yes $(PURECOV_BUILD_OPTIONS)
 TYPEMARKER = .purecov
 THR_LIB_SFX = .purecov
-TYPE_FLAGS = @DEBUG_CFLAGS@ -DPURECOV -DNO_JUMP_TABLE
+TYPE_FLAGS = @DEBUG_CFLAGS@ -fPIC -DPURECOV -DNO_JUMP_TABLE
 ENABLE_ALLOC_TYPE_VARS += purecov
 else
 TYPE=opt
 PURIFY =
 TYPEMARKER =
-TYPE_FLAGS = @CFLAGS@
+TYPE_FLAGS = @CFLAGS@ -fPIC 
 endif
 endif
 endif
@@ -92,7 +92,7 @@
 amd64CFLAGS=
 ppcCFLAGS=
 noarchCFLAGS=
-ARCHCFLAGS=$($(ARCH)CFLAGS)
+ARCHCFLAGS=$($(ARCH)CFLAGS) -fPIC
 
 ifdef HIPE_ENABLED
 ppcBEAMLDFLAGS=-Wl,-m,elf32ppc
--- erlang-10.b.1a.orig/erts/epmd/src/Makefile.in
+++ erlang-10.b.1a/erts/epmd/src/Makefile.in
@@ -51,7 +51,7 @@
 
 CC      = @CC@
 WFLAGS  = @WFLAGS@
-CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS)
+CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS) -fPIC
 LD      = @LD@
 LIBS    = @LIBS@
 LDFLAGS = @LDFLAGS@
--- erlang-10.b.1a.orig/erts/etc/common/Makefile.in
+++ erlang-10.b.1a/erts/etc/common/Makefile.in
@@ -43,7 +43,7 @@
 CC        = @CC@
 WFLAGS    = @WFLAGS@
 CFLAGS    = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) @WFLAGS@ -I$(SYSDIR) -I$(EMUDIR) \
-            -DOTP_SYSTEM_VERSION=\"$(SYSTEM_VSN)\"
+            -DOTP_SYSTEM_VERSION=\"$(SYSTEM_VSN)\" -fPIC
 LD        = @LD@
 LIBS      = @LIBS@
 LDFLAGS   = @LDFLAGS@
--- erlang-10.b.1a.orig/erts/lib_src/Makefile.in
+++ erlang-10.b.1a/erts/lib_src/Makefile.in
@@ -33,7 +33,7 @@
 ERLANG_OSTYPE=@ERLANG_OSTYPE@
 
 ifeq ($(TYPE),debug)
-CFLAGS=@DEBUG_CFLAGS@ -DDEBUG
+CFLAGS=@DEBUG_CFLAGS@ -DDEBUG -fPIC
 TYPE_SUFFIX=.debug
 ifeq ($(TARGET),win32)
 LD_FLAGS += -g
@@ -43,22 +43,22 @@
 else
 
 ifeq ($(TYPE),purify)
-CFLAGS=@CFLAGS@ -DPURIFY
+CFLAGS=@CFLAGS@ -DPURIFY -fPIC
 TYPE_SUFFIX=.purify
 PRE_LD=purify $(PURIFY_BUILD_OPTIONS)
 else
 ifeq ($(TYPE),quantify)
-CFLAGS=@CFLAGS@ -DQUANTIFY
+CFLAGS=@CFLAGS@ -DQUANTIFY -fPIC
 TYPE_SUFFIX=.quantify
 PRE_LD=quantify $(QUANTIFY_BUILD_OPTIONS)
 else
 ifeq ($(TYPE),purecov)
-CFLAGS=@DEBUG_CFLAGS@ -DPURECOV
+CFLAGS=@DEBUG_CFLAGS@ -DPURECOV -fPIC
 TYPE_SUFFIX=.purecov
 PRE_LD=purecov $(PURECOV_BUILD_OPTIONS)
 else
 override TYPE=opt
-CFLAGS=@CFLAGS@
+CFLAGS=@CFLAGS@ -fPIC
 TYPE_SUFFIX=
 PRE_LD=
 endif
@@ -66,7 +66,7 @@
 endif
 endif
 
-CFLAGS += @WFLAGS@ @DEFS@
+CFLAGS += @WFLAGS@ @DEFS@ -fPIC
 
 LIBS=@LIBS@
 
--- erlang-10.b.1a.orig/debian/erlang-base.dirs
+++ erlang-10.b.1a/debian/erlang-base.dirs
@@ -0,0 +1,10 @@
+usr/bin
+usr/lib/erlang
+usr/lib/erlang/erts-5.4.2.1/bin
+usr/lib/erlang/lib/asn1-1.4.4.3/priv/lib
+usr/lib/erlang/lib/crypto-1.2.1/priv/lib
+usr/lib/erlang/lib/erl_interface-3.5/lib
+usr/lib/erlang/lib/ic-4.2.7/priv/lib
+usr/lib/erlang/lib/megaco-2.1.6/priv/lib
+usr/lib/erlang/lib/runtime_tools-1.5/priv/lib
+usr/lib/erlang/lib/ssl-3.0.4/priv/obj
--- erlang-10.b.1a.orig/debian/updvsn
+++ erlang-10.b.1a/debian/updvsn
@@ -0,0 +1,78 @@
+#!/usr/bin/perl -w
+
+print "Updating file versions\n";
+
+my @files = ("debian/erlang-base.dirs", "debian/erlang-base.files",
+		"debian/erlang-base.links", "debian/erlang.dirs",
+		"debian/erlang.links");
+
+foreach my $file (@files) {
+    print "Processing: $file\n";
+    open CURFILE, "<$file" or die "Couldn't open $file: $!\n";
+    open OUTFILE, ">$file.new" or die "Couldn't open $file: $!\n";
+
+    while (<CURFILE>) {
+        chomp($_);
+
+	my($path, $library, $version, $ending, $newversion);
+
+	/(usr\/lib\/erlang\/lib\/)(\w+)-([\d\.]+)\s*$/;
+	unless ( defined($1) ) {
+
+	    # Other possibility is the /usr/lib/erlang/erts-* stuff
+	    /(usr\/lib\/erlang\/)(\w+)-([\d\.]+)(.*$)/;
+	    if ( ! defined($2) || $2 eq "" ) {
+	         print OUTFILE "$_\n";
+		 next;
+	    }
+
+	    $path = $1;
+	    $library = $2;
+	    $version = $3;
+	    $ending = $4;
+
+            next unless (-s "$library/vsn.mk");
+	    $newversion = `cat $library/vsn.mk | grep VSN`;
+	    $newversion =~ /.*=\s*([\d\.]+)\s+.*$/;
+	    $newversion = $1;
+
+	    print OUTFILE $path . "$library-$newversion" . "$ending\n";
+	    next;
+	}
+
+	unless (defined ($1) && defined ($2) && defined ($3) ) {
+            print OUTFILE "$_\n";
+            next;
+        }
+
+	$path = $1;
+	$library = $2;
+	$version = $3;
+
+	if (defined ($4)) {
+            $ending = $4;
+        } else {
+            $ending = "";
+        }
+
+        unless (-s "lib/$library/vsn.mk") {
+            # This directory does not exist.  Skip it.
+            next;
+        }
+
+	$newversion = `cat lib/$library/vsn.mk | grep VSN `;
+	$newversion =~ /.*=\s*([\d\.]+)\s+.*$/;
+	$newversion = $1;
+	
+	print OUTFILE $path . "$library-$newversion" . $ending . "\n";
+    }
+
+    close CURFILE;
+    close OUTFILE;
+
+    system("mv -f $file.new $file") == 0
+    	or die "Couldn't move $file.new to $file : $!\n";
+}
+
+print "Done.\n";
+
--- erlang-10.b.1a.orig/debian/erlang.links
+++ erlang-10.b.1a/debian/erlang.links
@@ -0,0 +1,8 @@
+usr/lib/erlang/erts-5.4.2.1/bin/ear         usr/bin/ear
+usr/lib/erlang/erts-5.4.2.1/bin/ecc         usr/bin/erl-ecc
+usr/lib/erlang/erts-5.4.2.1/bin/elink       usr/bin/elink
+usr/lib/erlang/erts-5.4.2.1/bin/erl         usr/bin/erl
+usr/lib/erlang/erts-5.4.2.1/bin/escript     usr/bin/escript
+usr/lib/erlang/lib/tools-2.4/emacs/erlang-start.el     usr/share/emacs/site-lisp/erlang/erlang-start.el
+usr/lib/erlang/lib/tools-2.4/emacs/erlang.el     usr/share/emacs/site-lisp/erlang/erlang.el
+usr/lib/erlang/lib/tools-2.4/emacs/README     usr/share/emacs/site-lisp/erlang/README
--- erlang-10.b.1a.orig/debian/compat
+++ erlang-10.b.1a/debian/compat
@@ -0,0 +1 @@
+4
--- erlang-10.b.1a.orig/debian/erlang.lintian-override
+++ erlang-10.b.1a/debian/erlang.lintian-override
@@ -0,0 +1,5 @@
+erlang: binary-without-manpage ear
+erlang: binary-without-manpage elink
+erlang: binary-without-manpage erl
+erlang: binary-without-manpage erl-ecc
+erlang: binary-without-manpage escript
--- erlang-10.b.1a.orig/debian/erlang-base.links
+++ erlang-10.b.1a/debian/erlang-base.links
@@ -0,0 +1,2 @@
+usr/lib/erlang/erts-5.4.2.1/bin/epmd	usr/lib/erlang/bin/epmd
+usr/lib/erlang/bin/erlc		usr/bin/erlc
--- erlang-10.b.1a.orig/debian/erlang.emacsen-install
+++ erlang-10.b.1a/debian/erlang.emacsen-install
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/#PACKAGE#
+
+# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=erlang
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+FLAVORTEST=`echo $FLAVOR | cut -c-6`
+if [ ${FLAVORTEST} = xemacs ] ; then
+    SITEFLAG="-no-site-file"
+else
+    SITEFLAG="--no-site-file"
+fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist. 
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+    echo install/${PACKAGE}: install Info links for ${FLAVOR}
+    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
+
--- erlang-10.b.1a.orig/debian/erlang.menu
+++ erlang-10.b.1a/debian/erlang.menu
@@ -0,0 +1,13 @@
+?package(erlang):needs="text" \
+	section="Apps/Programming" title="Erlang" \
+	longtitle="Erlang Toplevel" \
+	hints="erlang" \
+	command="/usr/bin/erl" \
+	icon="/usr/share/icons/erlang.xpm"
+?package(erlang):needs="x11" \
+	section="Apps/Programming" title="Erlang" \
+	longtitle="Erlang Toplevel" \
+	hints="erlang" \
+	command="/usr/bin/erl -s toolbar" \
+	icon="/usr/share/icons/erlang.xpm"
+
--- erlang-10.b.1a.orig/debian/copyright
+++ erlang-10.b.1a/debian/copyright
@@ -0,0 +1,314 @@
+This package was debianized by Brent A. Fulgham <bfulgham@debian.org> on
+Sat, 10 Aug 2002 23:16:47 -0700
+
+It was downloaded from the Erlang OTP Homepage at http://www.erlang.org.
+
+Authors:  (In Alphabetical Order)
+	  Stefan Anbratt, Ingela Anderton, Joe Armstrong, Gordon Beaton,
+	  Martin Bjorklund, Johan Blom, Hans Bolinder, Kent Boortz,
+	  Pascal Brisset, Richard Carlsson, Maurice Castro, Anders Dahlin,
+	  Jan-Erik Dahlin, Mick Dwyer, Klas Eriksson, Magnus Frieberg,
+	  Luke Gorrie <luke@vegetable.org>, Joakim Grebeno, Rickard Green,
+	  Dan Gudmundsson, Bjorn Gustavsson, Fredrik Gustafson,
+	  Bogumil Hausman, Per Hedeland, Peter Hogfeldt, Gunilla Hugosson,
+	  Erik Johansson, Arndt Jonasson, Micael Karlberg, Janne Lindblad,
+	  Anders Lindgren, Peter Lundel, Kenneth Lundin <kenneth@erix.ericsson.se>,
+	  Ulf Magnusson, Horkan Mattsson, Ingvar Meyer, Hans Nilsson,
+	  Mattias Nilsson, Raimo Niskanen, Patrik Nyblom, Sven-Olof Nystrom,
+	  Lennart Ohman, Peter Olin, Shawn Pearce <pearcs@rpi.edu>,
+	  Mikael Pettersson, Tony Rogvail <tony.rogvail@bluetail.com>,
+	  Kostis Sagonas, Ola Samuelsson, Ruslan Shevchenko <Ruslan@Shevchenko.Kiev.UA>,
+	  Sebastian Strollo <sebastian.strollo@bluetail.com>, Lars Thorsen,
+	  Fredrik Tillman, Torbjorn Tornquist, Markus Torpvret,
+	  Esko Vierumski, Robert Virding, Carl Wilhelm Welin, Sverker Wiberg,
+	  Jesper Wilhelmsson, Mike Williams, Claes Wikstrom, Patrik Winroth,
+	  Geoff Wong, Babbis Xagorarakis
+
+============================================================================
+
+ERLANG PUBLIC LICENSE
+Version 1.1
+
+1. Definitions.
+
+1.1. ``Contributor'' means each entity that creates or contributes to
+the creation of Modifications.
+
+1.2. ``Contributor Version'' means the combination of the Original
+Code, prior Modifications used by a Contributor, and the Modifications
+made by that particular Contributor.
+
+1.3. ``Covered Code'' means the Original Code or Modifications or the
+combination of the Original Code and Modifications, in each case
+including portions thereof.
+
+1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+accepted in the software development community for the electronic
+transfer of data.
+
+1.5. ``Executable'' means Covered Code in any form other than Source
+Code.
+
+1.6. ``Initial Developer'' means the individual or entity identified
+as the Initial Developer in the Source Code notice required by Exhibit
+A.
+
+1.7. ``Larger Work'' means a work which combines Covered Code or
+portions thereof with code not governed by the terms of this License.
+
+1.8. ``License'' means this document.
+
+1.9. ``Modifications'' means any addition to or deletion from the
+substance or structure of either the Original Code or any previous
+Modifications. When Covered Code is released as a series of files, a
+Modification is:
+
+A. Any addition to or deletion from the contents of a file containing
+   Original Code or previous Modifications. 
+
+B. Any new file that contains any part of the Original Code or
+   previous Modifications. 
+
+1.10. ``Original Code'' means Source Code of computer software code
+which is described in the Source Code notice required by Exhibit A as
+Original Code, and which, at the time of its release under this
+License is not already Covered Code governed by this License.
+
+1.11. ``Source Code'' means the preferred form of the Covered Code for
+making modifications to it, including all modules it contains, plus
+any associated interface definition files, scripts used to control
+compilation and installation of an Executable, or a list of source
+code differential comparisons against either the Original Code or
+another well known, available Covered Code of the Contributor's
+choice. The Source Code can be in a compressed or archival form,
+provided the appropriate decompression or de-archiving software is
+widely available for no charge.
+
+1.12. ``You'' means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities,``You'' includes any entity which controls, is controlled by,
+or is under common control with You. For purposes of this definition,
+``control'' means (a) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (b) ownership of fifty percent (50%) or more of the
+outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+2.1. The Initial Developer Grant.
+The Initial Developer hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property
+claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and
+    distribute the Original Code (or portions thereof) with or without
+    Modifications, or as part of a Larger Work; and 
+
+(b) under patents now or hereafter owned or controlled by Initial
+    Developer, to make, have made, use and sell (``Utilize'') the
+    Original Code (or portions thereof), but solely to the extent that
+    any such patent is reasonably necessary to enable You to Utilize
+    the Original Code (or portions thereof) and not to any greater
+    extent that may be necessary to Utilize further Modifications or
+    combinations. 
+
+2.2. Contributor Grant.
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property
+claims:
+
+(a) to use, reproduce, modify, display, perform, sublicense and
+    distribute the Modifications created by such Contributor (or
+    portions thereof) either on an unmodified basis, with other
+    Modifications, as Covered Code or as part of a Larger Work; and 
+
+(b) under patents now or hereafter owned or controlled by Contributor,
+    to Utilize the Contributor Version (or portions thereof), but
+    solely to the extent that any such patent is reasonably necessary
+    to enable You to Utilize the Contributor Version (or portions
+    thereof), and not to any greater extent that may be necessary to
+    Utilize further Modifications or combinations. 
+
+3. Distribution Obligations.
+
+3.1. Application of License.
+The Modifications which You contribute are governed by the terms of
+this License, including without limitation Section 2.2. The Source
+Code version of Covered Code may be distributed only under the terms
+of this License, and You must include a copy of this License with
+every copy of the Source Code You distribute. You may not offer or
+impose any terms on any Source Code version that alters or restricts
+the applicable version of this License or the recipients' rights
+hereunder. However, You may include an additional document offering
+the additional rights described in Section 3.5. 
+
+3.2. Availability of Source Code.
+Any Modification which You contribute must be made available in Source
+Code form under the terms of this License either on the same media as
+an Executable version or via an accepted Electronic Distribution
+Mechanism to anyone to whom you made an Executable version available;
+and if made available via Electronic Distribution Mechanism, must
+remain available for at least twelve (12) months after the date it
+initially became available, or at least six (6) months after a
+subsequent version of that particular Modification has been made
+available to such recipients. You are responsible for ensuring that
+the Source Code version remains available even if the Electronic
+Distribution Mechanism is maintained by a third party.
+
+3.3. Description of Modifications.
+You must cause all Covered Code to which you contribute to contain a
+file documenting the changes You made to create that Covered Code and
+the date of any change. You must include a prominent statement that
+the Modification is derived, directly or indirectly, from Original
+Code provided by the Initial Developer and including the name of the
+Initial Developer in (a) the Source Code, and (b) in any notice in an
+Executable version or related documentation in which You describe the
+origin or ownership of the Covered Code.
+
+3.4. Intellectual Property Matters
+
+(a) Third Party Claims.
+    If You have knowledge that a party claims an intellectual property
+    right in particular functionality or code (or its utilization
+    under this License), you must include a text file with the source
+    code distribution titled ``LEGAL'' which describes the claim and
+    the party making the claim in sufficient detail that a recipient
+    will know whom to contact. If you obtain such knowledge after You
+    make Your Modification available as described in Section 3.2, You
+    shall promptly modify the LEGAL file in all copies You make
+    available thereafter and shall take other steps (such as notifying
+    appropriate mailing lists or newsgroups) reasonably calculated to
+    inform those who received the Covered Code that new knowledge has
+    been obtained. 
+
+(b) Contributor APIs.
+    If Your Modification is an application programming interface and
+    You own or control patents which are reasonably necessary to
+    implement that API, you must also include this information in the
+    LEGAL file. 
+
+3.5. Required Notices.
+You must duplicate the notice in Exhibit A in each file of the Source
+Code, and this License in any documentation for the Source Code, where
+You describe recipients' rights relating to Covered Code. If You
+created one or more Modification(s), You may add your name as a
+Contributor to the notice described in Exhibit A. If it is not
+possible to put such notice in a particular Source Code file due to
+its structure, then you must include such notice in a location (such
+as a relevant directory file) where a user would be likely to look for
+such a notice. You may choose to offer, and to charge a fee for,
+warranty, support, indemnity or liability obligations to one or more
+recipients of Covered Code. However, You may do so only on Your own
+behalf, and not on behalf of the Initial Developer or any
+Contributor. You must make it absolutely clear than any such warranty,
+support, indemnity or liability obligation is offered by You alone,
+and You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or
+such Contributor as a result of warranty, support, indemnity or
+liability terms You offer.
+
+3.6. Distribution of Executable Versions.
+You may distribute Covered Code in Executable form only if the
+requirements of Section 3.1-3.5 have been met for that Covered Code,
+and if You include a notice stating that the Source Code version of
+the Covered Code is available under the terms of this License,
+including a description of how and where You have fulfilled the
+obligations of Section 3.2. The notice must be conspicuously included
+in any notice in an Executable version, related documentation or
+collateral in which You describe recipients' rights relating to the
+Covered Code. You may distribute the Executable version of Covered
+Code under a license of Your choice, which may contain terms different
+from this License, provided that You are in compliance with the terms
+of this License and that the license for the Executable version does
+not attempt to limit or alter the recipient's rights in the Source
+Code version from the rights set forth in this License. If You
+distribute the Executable version under a different license You must
+make it absolutely clear that any terms which differ from this License
+are offered by You alone, not by the Initial Developer or any
+Contributor. You hereby agree to indemnify the Initial Developer and
+every Contributor for any liability incurred by the Initial Developer
+or such Contributor as a result of any such terms You offer.
+
+3.7. Larger Works.
+You may create a Larger Work by combining Covered Code with other code
+not governed by the terms of this License and distribute the Larger
+Work as a single product. In such a case, You must make sure the
+requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Code due to statute
+or regulation then You must: (a) comply with the terms of this License
+to the maximum extent possible; and (b) describe the limitations and
+the code they affect. Such description must be included in the LEGAL
+file described in Section 3.4 and must be included with all
+distributions of the Source Code. Except to the extent prohibited by
+statute or regulation, such description must be sufficiently detailed
+for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+This License applies to code to which the Initial Developer has
+attached the notice in Exhibit A, and to related Covered Code.
+
+6. CONNECTION TO MOZILLA PUBLIC LICENSE
+
+This Erlang License is a derivative work of the Mozilla Public
+License, Version 1.0. It contains terms which differ from the Mozilla
+Public License, Version 1.0.
+
+7. DISCLAIMER OF WARRANTY.
+
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE
+IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
+CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
+OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER
+EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+This License and the rights granted hereunder will terminate
+automatically if You fail to comply with terms herein and fail to cure
+such breach within 30 days of becoming aware of the breach. All
+sublicenses to the Covered Code which are properly granted shall
+survive any termination of this License. Provisions which, by their
+nature, must remain in effect beyond the termination of this License
+shall survive.
+
+9. DISCLAIMER OF LIABILITY
+Any utilization of Covered Code shall not cause the Initial Developer
+or any Contributor to be liable for any damages (neither direct nor
+indirect).
+
+10. MISCELLANEOUS
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be construed by and in accordance with
+the substantive laws of Sweden. Any dispute, controversy or claim
+arising out of or relating to this License, or the breach, termination
+or invalidity thereof, shall be subject to the exclusive jurisdiction
+of Swedish courts, with the Stockholm City Court as the first
+instance.
+	
+EXHIBIT A.
+
+``The contents of this file are subject to the Erlang Public License,
+Version 1.1, (the "License"); you may not use this file except in
+compliance with the License. You should have received a copy of the
+Erlang Public License along with this software. If not, it can be
+retrieved via the world wide web at http://www.erlang.org/.
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+the License for the specific language governing rights and limitations
+under the License.
+
+The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+AB. All Rights Reserved.''
--- erlang-10.b.1a.orig/debian/erlang.emacsen-startup
+++ erlang-10.b.1a/debian/erlang.emacsen-startup
@@ -0,0 +1,12 @@
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+(setq load-path (cons (concat "/usr/share/"
+		(symbol-name debian-emacs-flavor)
+		"/site-lisp/erlang") load-path))
+(setq erlang-root-dir "/usr/lib/erlang")
+(setq exec-path (cons "/usr/lib/erlang/bin" exec-path))
+(require 'erlang-start)
+
+;; (setq auto-mode-alist (cons '("\\.erl$" . erlang-mode) auto-mode-alist))
+;; (setq auto-mode-alist (cons '("\\.hrl$" . erlang-mode) auto-mode-alist))
+																						  
--- erlang-10.b.1a.orig/debian/erlang.emacsen-remove
+++ erlang-10.b.1a/debian/erlang.emacsen-remove
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/#PACKAGE#
+
+FLAVOR=$1
+PACKAGE=erlang
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/#PACKAGE#.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
--- erlang-10.b.1a.orig/debian/extrafiles
+++ erlang-10.b.1a/debian/extrafiles
@@ -0,0 +1,61 @@
+lib/stdlib/src/erl_parse.erl
+lib/compiler/src/beam_opcodes.erl
+lib/compiler/src/core_parse.erl
+lib/gs/c_src/lib/tcl7.6/library/init.c
+lib/gs/c_src/lib/tcl7.6/library/parray.c
+lib/gs/c_src/lib/tcl7.6/library/ldAout.c
+lib/gs/c_src/lib/tcl7.6/library/tkcon.c
+lib/gs/c_src/lib/tcl7.6/library/tclIndex.h
+lib/gs/c_src/lib/tcl7.6/unix/config.log
+lib/gs/c_src/lib/tcl7.6/unix/config.status
+lib/gs/c_src/lib/tcl7.6/unix/Makefile
+lib/gs/c_src/lib/tcl7.6/unix/tclConfig.sh
+lib/gs/c_src/lib/tcl7.6/unix/pkgIndex.tcl
+lib/gs/c_src/lib/tk4.2/library/bgerror.c
+lib/gs/c_src/lib/tk4.2/library/button.c
+lib/gs/c_src/lib/tk4.2/library/clrpick.c
+lib/gs/c_src/lib/tk4.2/library/comdlg.c
+lib/gs/c_src/lib/tk4.2/library/console.c
+lib/gs/c_src/lib/tk4.2/library/dialog.c
+lib/gs/c_src/lib/tk4.2/library/entry.c
+lib/gs/c_src/lib/tk4.2/library/focus.c
+lib/gs/c_src/lib/tk4.2/library/listbox.c
+lib/gs/c_src/lib/tk4.2/library/menu.c
+lib/gs/c_src/lib/tk4.2/library/msgbox.c
+lib/gs/c_src/lib/tk4.2/library/obsolete.c
+lib/gs/c_src/lib/tk4.2/library/optMenu.c
+lib/gs/c_src/lib/tk4.2/library/palette.c
+lib/gs/c_src/lib/tk4.2/library/scale.c
+lib/gs/c_src/lib/tk4.2/library/scrlbar.c
+lib/gs/c_src/lib/tk4.2/library/tearoff.c
+lib/gs/c_src/lib/tk4.2/library/text.c
+lib/gs/c_src/lib/tk4.2/library/tkfbox.c
+lib/gs/c_src/lib/tk4.2/library/xmfbox.c
+lib/gs/c_src/lib/tk4.2/library/tk.c
+lib/gs/c_src/lib/tk4.2/unix/config.log
+lib/gs/c_src/lib/tk4.2/unix/config.status
+lib/gs/c_src/lib/tk4.2/unix/Makefile
+lib/gs/c_src/lib/tk4.2/unix/tkConfig.sh
+lib/gs/c_src/lib/tk4.2/unix/pkgIndex.tcl
+lib/gs/config.log
+lib/gs/config.status
+lib/orber/examples/Stack/StackModule_EmptyStack.erl
+lib/crypto/SKIP
+lib/etk/src/tkstr.erl
+lib/etk/config.log
+lib/etk/config.status
+lib/config.log
+lib/config.status
+erts/autoconf/config.log
+erts/etc/common/Install
+erts/etc/common/erl.src
+bootstrap/bin/erl
+bootstrap/bin/erlc
+bin/start.boot
+bin/start_sasl.boot
+bin/erlc
+config.cache
+bin/erl
+bin/start.script
+bin/start_sasl.script
+Makefile
--- erlang-10.b.1a.orig/debian/preservebeam
+++ erlang-10.b.1a/debian/preservebeam
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# Save beam files in a directory if this script is called without argument.
+# If -r (restore) is given, then all the beam files are removed and old
+# beam files are restored.
+#
+
+PRESERVED=../preserved.tar.gz
+
+preserve () {
+    if [ ! -f $PRESERVED ]; then
+	echo "Preserving beam files in $PRESERVED"
+	find . -type f -name \*.beam -print | xargs tar zcf $PRESERVED
+    else
+	echo "Beam files already preserved in $PRESERVED"
+    fi
+}
+
+restore () {
+    if [ ! -f $PRESERVED ]; then
+	echo "Warning: unable to restore beam files from $PRESERVED"
+    else
+	echo "Removing potentially bogus beam files"
+	find . -type f -name \*.beam -exec rm {} \;
+	echo "Restoring original beam files"
+	tar zxf $PRESERVED
+	rm $PRESERVED
+    fi
+}
+
+if [ "x$1" = x-r ]; then
+    restore
+else
+    preserve
+fi
--- erlang-10.b.1a.orig/debian/README.Debian
+++ erlang-10.b.1a/debian/README.Debian
@@ -0,0 +1,63 @@
+Open Source Erlang for DEBIAN
+-----------------------------
+
+Erlang is a programming language designed at the Ericsson Computer
+Science Laboratory.  Open-Source Erlang was released to help encourage
+the spread of Erlang outside of Ericsson.
+
+(From the White Paper:  http://erlang.org/white_paper.html)
+
+Erlang is characterized by the following features:
+     
+*  Concurrency - Erlang has extremely lightweight processes whose memory
+   requirements can vary dynamically. Processes have no shared memory and
+   communicate by asynchronous message passing. Erlang supports
+   applications with very large numbers of concurrent processes. No
+   requirements for concurrency are placed on the host operating system.
+					     
+*  Distribution - Erlang is designed to be run in a distributed
+   environment. An Erlang virtual machine is called an Erlang node. A
+   distributed Erlang system is a network of Erlang nodes (typically one
+   per processor). An Erlang node can create parallel processes running  
+   on other nodes, which perhaps use other operating systems. Processes  
+   residing on different nodes communicate in exactly the same was as   
+   processes residing on the same node.
+										                                        
+*  Robustness - Erlang has various error detection primitives which can 
+   be used to structure fault-tolerant systems. For example, processes  
+   can monitor the status and activities of other processes, even if    
+   these processes are executing on other nodes. Processes in a
+   distributed system can be configured to fail-over to other nodes in
+   case of failures and automatically migrate back to recovered nodes.
+*  Soft real-time - Erlang supports programming "soft" real-time systems,
+   which require response times in the order of milliseconds. Long
+   garbage collection delays in such systems are unacceptable, so Erlang
+   uses incremental garbage collection techniques.
+
+*  Hot code upgrade - Many systems cannot be stopped for software
+   maintenance. Erlang allows program code to be changed in a running
+   system. Old code can be phased out and replaced by new code. During  
+   the transition, both old code and new code can coexist. It is thus    
+   possible to install bug fixes and upgrades in a running system without
+   disturbing its operation.
+
+*  Incremental code loading - Users can control in detail how code is
+   loaded. In embedded systems, all code is usually loaded at boot time.
+   In development systems, code is loaded when it is needed, even when  
+   the system is running. If testing uncovers bugs, only the buggy code 
+   need be replaced.
+
+*  External interfaces - Erlang processes communicate with the outside
+   world using the same message passing mechanism as used between Erlang
+   processes. This mechanism is used for communication with the host
+   operating system and for interaction with programs written in other
+   languages. If required for reasons of efficiency, a special version of
+   this concept allows e.g. C programs to be directly linked into the
+   Erlang runtim
+
+The how's and why of Erlang are discussed at the website
+at: http://erlang.org
+
+Enjoy Erlang! :-)
+
+Brent A. Fulgham <bfulgham@debian.org>  Sat, 10 Aug 2002 23:16:47 -0700
--- erlang-10.b.1a.orig/debian/erlang.xpm
+++ erlang-10.b.1a/debian/erlang.xpm
@@ -0,0 +1,552 @@
+/* XPM */
+static char * erlang_xpm[] = {
+"32 30 519 2",
+"  	c None",
+". 	c #FFFFFF",
+"+ 	c #FCF7F9",
+"@ 	c #FAEFF1",
+"# 	c #FCEFEF",
+"$ 	c #FDF2F2",
+"% 	c #FFFBFB",
+"& 	c #FEFCFC",
+"* 	c #FEF9F9",
+"= 	c #FEFDFD",
+"- 	c #FFFDFE",
+"; 	c #FDF4F6",
+"> 	c #FCEFF3",
+", 	c #FCF7F7",
+"' 	c #EBC0CA",
+") 	c #D9808E",
+"! 	c #DF818A",
+"~ 	c #E99DA4",
+"{ 	c #FBE4E5",
+"] 	c #FDF8F9",
+"^ 	c #F3D6DD",
+"/ 	c #EBBEC2",
+"( 	c #EBAFB7",
+"_ 	c #F1C6C9",
+": 	c #F9E3E5",
+"< 	c #FDFAFB",
+"[ 	c #FDF6F8",
+"} 	c #EEB2C1",
+"| 	c #E4869C",
+"1 	c #D98090",
+"2 	c #EAC0C6",
+"3 	c #FDF9F9",
+"4 	c #DD808E",
+"5 	c #B4001A",
+"6 	c #B80C2A",
+"7 	c #D3637C",
+"8 	c #F8E7EA",
+"9 	c #FBF2F3",
+"0 	c #E4B2BD",
+"a 	c #C6405A",
+"b 	c #B31D30",
+"c 	c #C51534",
+"d 	c #CC2538",
+"e 	c #D96574",
+"f 	c #ECC3CC",
+"g 	c #FEFBFC",
+"h 	c #E899A8",
+"i 	c #C81A3B",
+"j 	c #B20022",
+"k 	c #D78095",
+"l 	c #FDF9FA",
+"m 	c #D98088",
+"n 	c #B70016",
+"o 	c #C2243A",
+"p 	c #EAB3BD",
+"q 	c #F0BEC4",
+"r 	c #B5334E",
+"s 	c #AA031E",
+"t 	c #AC0018",
+"u 	c #C20021",
+"v 	c #BF0020",
+"w 	c #B80822",
+"x 	c #D25C6B",
+"y 	c #FEF4F4",
+"z 	c #F6D9DC",
+"A 	c #CD384B",
+"B 	c #B1021E",
+"C 	c #D48097",
+"D 	c #DD808C",
+"E 	c #B7061E",
+"F 	c #C54F61",
+"G 	c #F9E7E9",
+"H 	c #DA8191",
+"I 	c #B41B40",
+"J 	c #AA0E36",
+"K 	c #B70D29",
+"L 	c #C70D2F",
+"M 	c #CA0E31",
+"N 	c #C30F2B",
+"O 	c #C93E50",
+"P 	c #F4D3D7",
+"Q 	c #FCF2F2",
+"R 	c #D36175",
+"S 	c #B90A24",
+"T 	c #D88095",
+"U 	c #D88094",
+"V 	c #B81434",
+"W 	c #D7909F",
+"X 	c #FEFBFD",
+"Y 	c #E3AAB9",
+"Z 	c #DE8BA6",
+"` 	c #DB8DA6",
+" .	c #DB8A9F",
+"..	c #E38A9F",
+"+.	c #E58DA4",
+"@.	c #E58A9F",
+"#.	c #E09CAF",
+"$.	c #F4DFE3",
+"%.	c #FFFEFE",
+"&.	c #DD8793",
+"*.	c #C0112A",
+"=.	c #E08091",
+"-.	c #D58093",
+";.	c #BA2144",
+">.	c #F0CDD4",
+",.	c #FFF9FC",
+"'.	c #FFFAFE",
+").	c #FFFDFF",
+"!.	c #FFFBFF",
+"~.	c #FFFCFF",
+"{.	c #E099A4",
+"].	c #BF162C",
+"^.	c #DE808D",
+"/.	c #D38194",
+"(.	c #BB2C47",
+"_.	c #FAE6E8",
+":.	c #F0BDC5",
+"<.	c #BF1E3C",
+"[.	c #D98094",
+"}.	c #DE839B",
+"|.	c #CB4160",
+"1.	c #FAECEF",
+"2.	c #F5D6D9",
+"3.	c #C02444",
+"4.	c #D98091",
+"5.	c #D78596",
+"6.	c #C84F65",
+"7.	c #FAF1F0",
+"8.	c #FFF5F5",
+"9.	c #F4C9CE",
+"0.	c #F0B9C1",
+"a.	c #EFBDC0",
+"b.	c #EFB8C0",
+"c.	c #EFB7C0",
+"d.	c #EFB5C0",
+"e.	c #EFC0C2",
+"f.	c #EFC0CB",
+"g.	c #EFC0D0",
+"h.	c #EFC0CD",
+"i.	c #EFC0C5",
+"j.	c #EFC0C0",
+"k.	c #EFC0C6",
+"l.	c #EAA1A8",
+"m.	c #C11B3B",
+"n.	c #D98095",
+"o.	c #E08599",
+"p.	c #D04C63",
+"q.	c #FAF0EF",
+"r.	c #FAE2E7",
+"s.	c #D25364",
+"t.	c #BA233F",
+"u.	c #B92341",
+"v.	c #B52141",
+"w.	c #C12139",
+"x.	c #C42334",
+"y.	c #C5203A",
+"z.	c #B71E47",
+"A.	c #BD2543",
+"B.	c #C62544",
+"C.	c #CE2548",
+"D.	c #CA2546",
+"E.	c #C0253C",
+"F.	c #B8253A",
+"G.	c #C52542",
+"H.	c #D0254B",
+"I.	c #D11F3F",
+"J.	c #C1052D",
+"K.	c #E28098",
+"L.	c #FEF9FA",
+"M.	c #DB8493",
+"N.	c #C84562",
+"O.	c #FAEEEF",
+"P.	c #FCE3E6",
+"Q.	c #CC3D45",
+"R.	c #B0031F",
+"S.	c #A30129",
+"T.	c #9F0028",
+"U.	c #BA0019",
+"V.	c #B2011D",
+"W.	c #B20019",
+"X.	c #B8001F",
+"Y.	c #B80128",
+"Z.	c #B30129",
+"`.	c #B20128",
+" +	c #B3012D",
+".+	c #B7012A",
+"++	c #B80127",
+"@+	c #B70127",
+"#+	c #C10127",
+"$+	c #C80125",
+"%+	c #BC001D",
+"&+	c #DE8097",
+"*+	c #E3818E",
+"=+	c #C62C45",
+"-+	c #F5E6EB",
+";+	c #FFF2F2",
+">+	c #DA445F",
+",+	c #BE031F",
+"'+	c #BB0020",
+")+	c #AD0031",
+"!+	c #B90024",
+"~+	c #B80022",
+"{+	c #C50025",
+"]+	c #BA0024",
+"^+	c #B30023",
+"/+	c #B60024",
+"(+	c #BE0022",
+"_+	c #BB0023",
+":+	c #AB0022",
+"<+	c #AC0021",
+"[+	c #AF0022",
+"}+	c #BE001B",
+"|+	c #B30020",
+"1+	c #DA8092",
+"2+	c #DE8088",
+"3+	c #C02439",
+"4+	c #EFD7DA",
+"5+	c #C75768",
+"6+	c #BE0624",
+"7+	c #C7002B",
+"8+	c #AD0024",
+"9+	c #B90025",
+"0+	c #B00023",
+"a+	c #B50023",
+"b+	c #BC0013",
+"c+	c #BB0015",
+"d+	c #B2001E",
+"e+	c #B10022",
+"f+	c #B3001F",
+"g+	c #BC082A",
+"h+	c #BF0F2A",
+"i+	c #B50723",
+"j+	c #B1011F",
+"k+	c #C40020",
+"l+	c #BF0022",
+"m+	c #D98087",
+"n+	c #BB152A",
+"o+	c #E0979A",
+"p+	c #FFFFFE",
+"q+	c #E79295",
+"r+	c #BE1631",
+"s+	c #C10014",
+"t+	c #C10022",
+"u+	c #BD0023",
+"v+	c #B50027",
+"w+	c #C00026",
+"x+	c #B30015",
+"y+	c #AD001C",
+"z+	c #AE0021",
+"A+	c #B4022D",
+"B+	c #CC3A59",
+"C+	c #E38390",
+"D+	c #CF5D6B",
+"E+	c #B62336",
+"F+	c #AB0A22",
+"G+	c #B10221",
+"H+	c #D58094",
+"I+	c #D1808F",
+"J+	c #B60B26",
+"K+	c #D76A78",
+"L+	c #FCF6F4",
+"M+	c #FBDBE6",
+"N+	c #D24B64",
+"O+	c #BF0630",
+"P+	c #A80020",
+"Q+	c #BF0017",
+"R+	c #B00020",
+"S+	c #B80024",
+"T+	c #BA001D",
+"U+	c #AC0015",
+"V+	c #A9050F",
+"W+	c #BE2944",
+"X+	c #E099AD",
+"Y+	c #FCF2F4",
+"Z+	c #FDF8F8",
+"`+	c #E9C5C4",
+" @	c #C46776",
+".@	c #BD1736",
+"+@	c #E48191",
+"@@	c #DD8098",
+"#@	c #B50129",
+"$@	c #BE2D4E",
+"%@	c #F0C7CF",
+"&@	c #EFBEC3",
+"*@	c #BD2A4E",
+"=@	c #A60226",
+"-@	c #B40021",
+";@	c #B3000E",
+">@	c #BC001A",
+",@	c #A50027",
+"'@	c #BD002A",
+")@	c #AC0321",
+"!@	c #B6303E",
+"~@	c #E8ABB1",
+"{@	c #FEFAFA",
+"]@	c #F6E6E8",
+"^@	c #CC3E53",
+"/@	c #DF8390",
+"(@	c #E18094",
+"_@	c #C00023",
+":@	c #CB102F",
+"<@	c #DD768A",
+"[@	c #FDF7F8",
+"}@	c #E29AA6",
+"|@	c #CB3249",
+"1@	c #AE0A2B",
+"2@	c #AD001B",
+"3@	c #BC0022",
+"4@	c #A50128",
+"5@	c #B40F3A",
+"6@	c #C33C59",
+"7@	c #E0A0AB",
+"8@	c #FDFBFB",
+"9@	c #E3A9AE",
+"0@	c #B91930",
+"a@	c #D2808D",
+"b@	c #DA8091",
+"c@	c #BA001F",
+"d@	c #BA031A",
+"e@	c #BC354A",
+"f@	c #E6B3BD",
+"g@	c #FEF6F8",
+"h@	c #F3BBBF",
+"i@	c #D77181",
+"j@	c #DA5A74",
+"k@	c #DA5868",
+"l@	c #D15C71",
+"m@	c #DC7C92",
+"n@	c #EFCAD4",
+"o@	c #FEFBFB",
+"p@	c #F0C3CC",
+"q@	c #CB3E52",
+"r@	c #B5051E",
+"s@	c #D5808D",
+"t@	c #DE9BAB",
+"u@	c #C53354",
+"v@	c #C23559",
+"w@	c #B93559",
+"x@	c #D47789",
+"y@	c #FBE2E4",
+"z@	c #FFFEFF",
+"A@	c #FEF7FA",
+"B@	c #FEF3F5",
+"C@	c #FDF6FB",
+"D@	c #FEFCFD",
+"E@	c #F9F0F1",
+"F@	c #DE8798",
+"G@	c #D04156",
+"H@	c #C4334E",
+"I@	c #DC9BA9",
+"J@	c #EEDCDE",
+"K@	c #D5A1AE",
+"L@	c #D6A4B5",
+"M@	c #DDA9C0",
+"N@	c #EFC7D0",
+"O@	c #F3E3E4",
+"P@	c #F1F1EE",
+"Q@	c #FAFAF8",
+"R@	c #FAFAFA",
+"S@	c #F6F6F3",
+"T@	c #FDFDFB",
+"U@	c #FBFBFB",
+"V@	c #EEEEEE",
+"W@	c #F3F3F3",
+"X@	c #FCFCFC",
+"Y@	c #F6F4F4",
+"Z@	c #FAF7F7",
+"`@	c #F8F1F3",
+" #	c #D5B0B5",
+".#	c #D0A0A3",
+"+#	c #E9B4C2",
+"@#	c #F6DEE5",
+"##	c #747474",
+"$#	c #8A8989",
+"%#	c #C5C2C2",
+"&#	c #F5F5F5",
+"*#	c #B6B6B5",
+"=#	c #7F7F7C",
+"-#	c #A29E9C",
+";#	c #E2DFDF",
+">#	c #D9D9D6",
+",#	c #AFAFA9",
+"'#	c #E9E9E7",
+")#	c #D4D4D4",
+"!#	c #767676",
+"~#	c #FDFDFD",
+"{#	c #D9D9D9",
+"]#	c #888888",
+"^#	c #C6C6C6",
+"/#	c #E6E6E6",
+"(#	c #ADAAAA",
+"_#	c #C9C5C5",
+":#	c #EBEAEA",
+"<#	c #AAAAAA",
+"[#	c #7A7A7A",
+"}#	c #727272",
+"|#	c #8E8E8E",
+"1#	c #EFEFEF",
+"2#	c #E5E5E5",
+"3#	c #343434",
+"4#	c #A6A4A4",
+"5#	c #DFD7D7",
+"6#	c #898988",
+"7#	c #595959",
+"8#	c #656262",
+"9#	c #AEACAC",
+"0#	c #C0C0BC",
+"a#	c #757572",
+"b#	c #D8D8D7",
+"c#	c #FEFEFE",
+"d#	c #828282",
+"e#	c #191919",
+"f#	c #BFBFBF",
+"g#	c #232323",
+"h#	c #666666",
+"i#	c #BDBDBD",
+"j#	c #706F6F",
+"k#	c #9E9D9D",
+"l#	c #B1B0B0",
+"m#	c #515151",
+"n#	c #898989",
+"o#	c #989898",
+"p#	c #5D5D5D",
+"q#	c #E4E4E4",
+"r#	c #272727",
+"s#	c #7C7A7A",
+"t#	c #C6BEBE",
+"u#	c #EDECEC",
+"v#	c #808080",
+"w#	c #3E3D3E",
+"x#	c #676565",
+"y#	c #BEBDBD",
+"z#	c #BEBEBD",
+"A#	c #6D6D6C",
+"B#	c #4E4E4E",
+"C#	c #5A5A5A",
+"D#	c #565656",
+"E#	c #F8F8F8",
+"F#	c #353535",
+"G#	c #686868",
+"H#	c #6A6A6A",
+"I#	c #636363",
+"J#	c #999999",
+"K#	c #878787",
+"L#	c #585858",
+"M#	c #CACACA",
+"N#	c #C4C4C4",
+"O#	c #8D8D8D",
+"P#	c #2D2B2B",
+"Q#	c #9C9292",
+"R#	c #D7D3D3",
+"S#	c #EDEBEB",
+"T#	c #100F0F",
+"U#	c #686464",
+"V#	c #DDDADA",
+"W#	c #BEBEBE",
+"X#	c #D3D3D3",
+"Y#	c #D0D0D0",
+"Z#	c #2B2B2B",
+"`#	c #535353",
+" $	c #323232",
+".$	c #CECECE",
+"+$	c #B2B2B2",
+"@$	c #474747",
+"#$	c #3A3A3A",
+"$$	c #505050",
+"%$	c #CBCBCB",
+"&$	c #BBB3B3",
+"*$	c #444242",
+"=$	c #969696",
+"-$	c #252525",
+";$	c #716E6E",
+">$	c #BAB8B8",
+",$	c #353434",
+"'$	c #626161",
+")$	c #C4C3C3",
+"!$	c #4D4D4D",
+"~$	c #707070",
+"{$	c #DDD3D3",
+"]$	c #A8A7A7",
+"^$	c #404040",
+"/$	c #AFAFAF",
+"($	c #616161",
+"_$	c #E8E8E8",
+":$	c #787878",
+"<$	c #262626",
+"[$	c #4B4A4A",
+"}$	c #7B7A7A",
+"|$	c #2C2A29",
+"1$	c #BBBBBB",
+"2$	c #F1F1F1",
+"3$	c #8B8B8B",
+"4$	c #929191",
+"5$	c #C6C0C0",
+"6$	c #F6F3F3",
+"7$	c #C3C3C3",
+"8$	c #B7B7B7",
+"9$	c #D2D2D2",
+"0$	c #D8D8D8",
+"a$	c #979797",
+"b$	c #D7D5D5",
+"c$	c #B4B4B4",
+"d$	c #C7C7C7",
+"e$	c #F0F0F0",
+"f$	c #C1C1C1",
+"g$	c #DEDEDE",
+"h$	c #B0B0B0",
+"i$	c #D7D7D7",
+"j$	c #A1A1A1",
+"k$	c #CCCCCC",
+"l$	c #F4F1F1",
+"m$	c #C7C2C2",
+"n$	c #9A9898",
+"o$	c #918F8F",
+"p$	c #C3BCB4",
+"q$	c #F6F5F3",
+"r$	c #F9F9F9",
+"s$	c #FCFBFB",
+"t$	c #FDFCFC",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". + @ # $ % . . . . . . . . . & * = . . . . . . . . - ; > @ , . ",
+"& ' ) ! ~ { . . . . . . . ] ^ / ( _ : < . . . . . . [ } | 1 2 & ",
+"3 4 5 6 7 8 . . . . . . 9 0 a b c d e f . . . . . . g h i j k l ",
+"3 m n o p . . . . . . . q r s t u v w x y . . . . . . z A B C l ",
+"3 D E F G . . . . . . . H I J K L M N O P . . . . . . Q R S T l ",
+"l U V W X . . . . . . . Y Z `  ...+.@.#.$.. . . . . . %.&.*.=.3 ",
+"3 -.;.>.. . . . . . . . ,.'.).!.!.).!.~.. . . . . . . . {.].^.3 ",
+"l /.(._.. . . . . . . . . . . . . . . . . . . . . . . . :.<.[.l ",
+"l }.|.1.. . . . . . . . . . . . . . . . . . . . . . . . 2.3.4.3 ",
+"3 5.6.7.. . . . . . . 8.9.0.a.b.b.a.c.d.e.f.g.h.i.j.j.k.l.m.n.l ",
+"l o.p.q.. . . . . . . r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.",
+"3 M.N.O.. . . . . . . P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+l ",
+"* *+=+-+. . . . . . . ;+>+,+'+)+!+~+{+]+^+/+(+_+^+:+<+[+}+|+1+3 ",
+"3 2+3+4+. . . . . . . . 5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+1+3 ",
+"3 m+n+o+p+. . . . . . . q+r+s+t+u+v+w+x+y+0+z+A+B+C+D+E+F+G+H+l ",
+"3 I+J+K+L+. . . . . . . M+N+O+P+u+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@* ",
+"l @@#@$@%@. . . . . . . . &@*@=@-@;@>@,@'@)@!@~@{@. . . ]@^@/@3 ",
+"L.(@_@:@<@[@. . . . . . . . }@|@1@2@3@4@5@6@7@8@. . . {@9@0@a@3 ",
+"3 b@c@d@e@f@g@. . . . . . . . h@i@j@k@l@m@n@%.. . . o@p@q@r@s@3 ",
+"< t@u@v@w@x@y@. . . . . . . . z@g A@B@C@D@. . . . . E@F@G@H@I@< ",
+"= J@K@L@M@N@O@P@Q@. R@S@T@. . U@V@R@. R@W@. X@Y@Z@%.`@ #.#+#@#- ",
+". V@##$#%#&#*#=#-#;#>#,#'#. . )#!#)#~#{#]#^#/#(#_#:#<#[#}#|#1#. ",
+". 2#3#4#5#V@6#7#8#9#0#a#b#c#. d#e#|#X@f#g#h#i#j#k#l#m#n#o#p#/#. ",
+". q#r#s#t#u#v#w#x#y#z#A#)#c#R@B#C#D#E#i#F#G#H#I#J#K#L#M#N#O#)#~#",
+". q#P#Q#R#S#[#T#U#V#W#H#X#c#Y#Z#`# $.$W#C#+$@$#$J#d#$$%$&$*$=$R@",
+". q#-$;$>$u#d#,$'$)$i#!$~${$]$^$n#^$/$W#($_$:$<$J#l#[$}$s#|$1$X@",
+". 2$3$4$5$6$7$8$8$9$0$a$3$b$c$d$e$f$f#g$h$~#i$j$k$l$m$n$o$p$q$. ",
+". c#r$r$s$%.X@X@U@X@~#r$E#~#R@~#. X@U@~#U@. ~#R@X@. t$r$E#t$. . "};
--- erlang-10.b.1a.orig/debian/erlang.docs
+++ erlang-10.b.1a/debian/erlang.docs
@@ -0,0 +1,2 @@
+README
+AUTHORS
--- erlang-10.b.1a.orig/debian/erlang-base.files
+++ erlang-10.b.1a/debian/erlang-base.files
@@ -0,0 +1,31 @@
+usr/lib/erlang/bin/erlc
+usr/lib/erlang/bin/run_erl
+usr/lib/erlang/bin/to_erl
+usr/lib/erlang/erts-*/bin/beam
+usr/lib/erlang/erts-*/bin/beam.elib
+usr/lib/erlang/erts-*/bin/beam.elib.shared
+usr/lib/erlang/erts-*/bin/beam.shared
+usr/lib/erlang/erts-*/bin/child_setup
+usr/lib/erlang/erts-*/bin/child_setup.shared
+usr/lib/erlang/erts-*/bin/epmd
+usr/lib/erlang/erts-*/bin/erlc
+usr/lib/erlang/erts-*/bin/erlexec
+usr/lib/erlang/erts-*/bin/heart
+usr/lib/erlang/erts-*/bin/inet_gethost
+usr/lib/erlang/erts-*/bin/run_erl
+usr/lib/erlang/erts-*/bin/to_erl
+usr/lib/erlang/erts-*/lib/internal/*.a
+usr/lib/erlang/lib/asn1-*/priv/lib/*.so
+usr/lib/erlang/lib/crypto-*/priv/lib/*.o
+usr/lib/erlang/lib/crypto-*/priv/lib/*.so
+usr/lib/erlang/lib/crypto-*/priv/obj/*.o
+usr/lib/erlang/lib/erl_interface-*/bin/erl_call
+usr/lib/erlang/lib/erl_interface-*/lib/*.a
+usr/lib/erlang/lib/ic-*/priv/lib/*.a
+usr/lib/erlang/lib/megaco-*/priv/lib/*.so
+usr/lib/erlang/lib/orber-*/priv/bin/obj_init_port
+usr/lib/erlang/lib/os_mon-*/priv/bin/memsup
+usr/lib/erlang/lib/runtime_tools-*/priv/lib/*.so
+usr/lib/erlang/lib/ssl-*/priv/bin/ssl_esock
+usr/lib/erlang/lib/ssl-*/priv/obj/*.o
+
--- erlang-10.b.1a.orig/debian/rules
+++ erlang-10.b.1a/debian/rules
@@ -0,0 +1,264 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+MACHINE=$(shell uname -m)
+VERSION=$(shell cat erts/vsn.mk | grep "^VSN" | sed "s/VSN = //")
+
+ifeq ("$(MACHINE)", "i586")
+	HIPE=--enable-hipe
+endif
+
+build: config-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+
+config: config-stamp
+config-stamp:
+
+	sh debian/preservebeam
+
+	# debian/updvsn # Use when new Erlang release comes out.
+
+	-for i in . erts lib lib/gs lib/erl_interface lib/megaco lib/snmp;		\
+	do					\
+		(cd $${i} && autoconf2.13)	\
+	done
+
+	./configure --prefix=/usr --libexecdir=/usr/bin			\
+		--infodir=/usr/share/info --mandir=/usr/share/man	\
+		--enable-threads $(HIPE)
+	
+	touch config-stamp
+
+clean:
+	echo "ERTS VERSION = $(VERSION)"
+	sleep 2
+
+	dh_testdir
+	dh_testroot
+	sh debian/preservebeam
+	-rm -f build-stamp install-stamp config-stamp 
+	-rm -f config.cache config.log config.status
+	-rm erts/config.log
+	-rm lib/config.log lib/config.status
+	-rm lib/gs/config.log lib/gs/config.status
+	-rm lib/megaco/config.log lib/megaco/config.status
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	find . -name \*~ -exec rm {} \;
+	find . -name *.class -exec rm {} \;
+	find . -name config.log -exec rm {} \;
+	find . -name config.status -exec rm {} \;
+	find . -name *.jar -exec rm {} \;
+	find . -name erl_crash.dump -exec rm {} \;
+	find . -name `erts/autoconf/config.guess` -type d | xargs rm -rf \
+		     2> /dev/null || true
+	-rm -f lib/asn1/priv/bin/asn1_erl_drv.so
+	-rm -f lib/asn1/priv/lib/asn1_erl_drv.so
+	-rm -f bootstrap/bin/erlc bootstrap/bin/ecc
+	-rm -rf bin
+
+	-for i in . erts lib lib/gs lib/megaco lib/erl_interface;	\
+	do								\
+		rm -f $${i}/configure;					\
+	done
+
+	-rm erts/boot/src/ear
+	-rm erts/boot/src/ecc
+	-rm erts/boot/src/elink
+	-rm erts/boot/src/erlang.ear
+	-rm erts/boot/src/escript
+	-rm erts/boot/src/esh
+	-rm erts/boot/src/stub.hrl
+	-rm erts/boot/esh
+	-rm bootstrap/bin/erl
+	-for i in asn1 hipe ic parsetools sasl snmp;			\
+	do								\
+	    rm -rf bootstrap/lib/$${i};					\
+	done
+	-rm erts/etc/common/erl.src
+	-rm -rf erts/etc/comon/Install
+	-for i in obj.purecov.beam obj.purify.beam obj.quantify.beam	\
+			obj.shared.beam;				\
+	do								\
+		rm -rf erts/$${i};					\
+	done
+	-rm -rf lib/asn1/priv/obj
+	-rm -rf lib/asn1/priv/lib
+	-rm lib/cosEventDomain/include/CosEventDomainAdmin_EventDomain.hrl
+	-rm lib/cosEventDomain/include/CosEventDomainAdmin_EventDomainFactory.hrl
+	-rm lib/cosEventDomain/include/CosEventDomainAdmin.hrl
+	-rm lib/cosEventDomain/include/oe_CosEventDomainAdmin.hrl
+	-rm -rf lib/crypto/priv/lib lib/crypto/priv/obj
+	-rm -rf lib/erl_interface/bin lib/erl_interface/obj
+	-rm -rf lib/erl_interface/obj.mt lib/erl_interface/obj.st
+	-rm -rf lib/gs/tcl/win32
+	-rm -rf lib/ic/priv/com
+	-for i in mnesia_Checkpoints.erl mnesia_Indices.erl mnesia_KeyList.erl \
+			mnesia_NodeList.erl mnesia_Recordlist.erl	\
+			mnesia_TableList.erl mnesia_AttrNames.erl;	\
+	do								\
+		rm -rf lib/mnesia_session/src/$${i};			\
+	done
+	-rm -rf lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_AlreadyBound.erl
+	-rm -rf lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_CannotProceed.erl
+	-rm -rf lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_InvalidName.erl
+	-rm -rf lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotEmpty.erl
+	-rm -rf lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotFound.erl
+	-rm -rf lib/runtime_tools/priv/lib lib/runtime_tools/priv/obj
+	-rm -rf lib/snmp/mibs/Makefile
+	-rm -rf lib/stdlib/src/erl_parse.erl
+	-rm -rf lib/tools/src/xref_parser.erl
+	-rm -rf lib/webtool/ebin/webtool.appup
+
+	sh debian/preservebeam -r
+						
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a -i
+
+	# Add here commands to install the package into debian/erlang.
+	$(MAKE) INSTALL_PREFIX=`pwd`/debian/erlang install
+
+	cd `pwd`/debian/erlang/usr/lib/erlang/erts-$(VERSION)/bin;	\
+	for val in erl erl.src start start_erl.src start.src;		\
+	do								\
+		TEMP=`tempfile`;					\
+		if [ -f $${val} ]; then					\
+			sed 's/ROOTDIR=.*/ROOTDIR=\/usr\/lib\/erlang/' 	\
+				$${val} > $${TEMP};			\
+			rm $${val};					\
+			mv $${TEMP} $${val};				\
+			chmod 0755 $${val};				\
+		fi;							\
+	done
+	cd `pwd`/debian/erlang/usr/lib/erlang/erts-$(VERSION)/bin;	\
+	for val in ear ecc elink escript esh;				\
+	do								\
+		TEMP=`tempfile`;					\
+		if [ -f $${val} ]; then					\
+			sed 's/ERLANG_EARS=.*/ERLANG_EARS=\/usr\/lib\/erlang\/erts-$(VERSION)/' $${val} | sed 's/exec.*/exec \/usr\/lib\/erlang\/erts-$(VERSION)\/bin\/beam_evm $$0 $$\{1\+\"$$@\"\}/' > $${TEMP};	\
+			rm $${val};					\
+			mv $${TEMP} $${val};				\
+			chmod 0755 $${val};				\
+		fi;							\
+	done
+
+	cd `pwd`/debian/erlang/usr/lib/erlang/bin;			\
+	for val in erl start start_er start.script;			\
+	do								\
+		TEMP=`tempfile`;					\
+		if [ -f $${val} ]; then					\
+			sed 's/ROOTDIR=.*/ROOTDIR=\/usr\/lib\/erlang/'	\
+				$${val} > $${TEMP}; 			\
+			rm $${val};					\
+			mv $${TEMP} $${val};				\
+			chmod 0755 $${val};				\
+		fi;							\
+	done
+	cd `pwd`/debian/erlang/usr/lib/erlang/bin;			\
+	for val in ear ecc elink escript esh;				\
+	do								\
+		TEMP=`tempfile`;					\
+		if [ -f $${val} ]; then					\
+			sed 's/ERLANG_EARS=.*/ERLANG_EARS=\/usr\/lib\/erlang\/erts-$(VERSION)/' $${val} | sed 's/exec.*/exec \/usr\/lib\/erlang\/erts-$(VERSION)\/bin\/beam_evm $$0 $${1\+\"$$@\"\}/' > $${TEMP};	\
+			rm $${val};					\
+			mv $${TEMP} $${val};				\
+			chmod 0755 $${val};				\
+		fi;							\
+	done
+	cp `pwd`/debian/erlang.xpm `pwd`/debian/erlang/usr/share/icons
+
+	dh_movefiles --sourcedir=debian/erlang -perlang-base
+
+	# Get rid of bad link in erlang package
+	-rm -f `pwd`/debian/erlang/usr/lib/erlang/bin/epmd
+	-find `pwd`/debian/erlang/usr/lib/erlang/lib -name info -exec rm {} \;
+	-rm -rf `pwd`/debian/erlang/usr/lib/erlang/erts-$(VERSION)/doc
+
+	-cd `pwd`/debian/erlang/usr/bin;				\
+	for val in ear ecc elink erl erlc escript esh;			\
+	do								\
+		rm -f `pwd`/debian/erlang/usr/bin/$${val};		\
+	done
+
+	# Get rid of windows cruft
+	-find `pwd`/debian/erlang -name *.bat -exec rm {} \;
+	-find `pwd`/debian/erlang-base -name *.bat -exec rm {} \;
+	-chmod aog-x `pwd`/debian/erlang/usr/lib/erlang/bin/start.script
+	-chmod aog-x `pwd`/debian/erlang-base/usr/lib/erlang/bin/start.script
+	-chmod aog-x `pwd`/debian/erlang/bin/start.script
+	-chmod aog-x `pwd`/debian/erlang-base/bin/start.script
+	-rm -f `pwd`/debian/erlang/usr/bin/erlc
+	-rm -f `pwd`/debian/erlang/usr/bin/ecc
+	
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+	dh_testdir
+	dh_testroot
+	dh_installdocs -perlang
+	dh_installexamples -perlang
+	dh_installmenu -perlang
+	dh_installemacsen -perlang
+	dh_link -perlang
+#	dh_installinit
+	dh_installcron
+#	dh_installmanpages
+	dh_installchangelogs -perlang
+	install -m 644 debian/erlang.lintian-override `pwd`/debian/erlang/usr/share/lintian/overrides/erlang
+	dh_strip -perlang
+	dh_compress -perlang
+	dh_fixperms -perlang
+	dh_installdeb -perlang
+	dh_shlibdeps -perlang
+	dh_gencontrol -perlang
+	dh_makeshlibs -perlang
+	dh_md5sums -perlang
+	dh_builddeb -perlang
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -perlang-base
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installemacsen
+	dh_installinit
+	dh_installcron
+#	dh_installmanpages
+	dh_installchangelogs -perlang-base
+	dh_link -perlang-base
+	dh_strip -perlang-base
+	dh_compress -perlang-base
+	dh_fixperms -perlang-base
+	dh_installdeb -perlang-base
+	dh_shlibdeps -perlang-base -Xusr/lib/erlang/lib/crypto-1.2.1/priv/obj/crypto_drv.o
+	dh_gencontrol -perlang-base
+	dh_makeshlibs -perlang-base
+	dh_md5sums -perlang-base
+	dh_builddeb -perlang-base
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-arch binary-indep 
+.PHONY: build clean binary-indep binary-arch binary install
--- erlang-10.b.1a.orig/debian/control
+++ erlang-10.b.1a/debian/control
@@ -0,0 +1,109 @@
+Source: erlang
+Maintainer: Brent A. Fulgham <bfulgham@debian.org>
+Section: interpreters
+Priority: optional
+Standards-Version: 3.6.1.0
+Build-Depends: perl5, debhelper, autoconf2.13, awk, openssl, libssl-dev, sed, m4, xlibs-dev, libncurses5-dev
+
+Package: erlang
+Architecture: all
+Pre-Depends: dpkg (>= 1.4.1.17)
+Depends: debianutils (>= 1.13.1), ${erlang:Depends}, erlang-base (=${Source-Version}), tk8.4
+Conflicts: erlang-base (<< ${Source-Version}) erlang-jams, erlang-jams-erl, erlang-dev, erlang-mode, erlang-manpages (<< 1:10.b.1a), elastic-base, libxmerl-erlang
+Replaces: erlang-base (<< ${Source-Version})
+Suggests: erlang-manpages (= 1:10.b.1a), erlang-doc-html (=1:10.b.1a)
+Description: A real-time, concurrent and distributed functional language
+ Open Source Erlang is a functional programming language designed at
+ the Ericcson Computer Science Laboratory.
+ .
+ Some of Erlang's main features are:
+  Clear declarative syntax and is largely free from side-effects;
+  Builtin support for real-time, concurrent and distributed programming;
+  Designed for development of robust and continously operated programs;
+  Dynamic code replacement at runtime.
+ .
+ This package contains all the architecture independent files and the bulk
+ of the tools and libraries.
+Description-de: Eine simultane, verteilte und funktionelle Echtzeit-Sprache
+ »Open Source Erlang« ist eine funktionelle Programmiersprache, die am
+ Ericcson-Laboratorium für Computerwissenschaft konzipiert wird.
+ .
+ Einige der Hauptmöglichkeiten von Erlang sind:
+ Klare, deklaratorische Syntax und weitgehend frei von Nebeneffekten;
+ Eingebaute Unterstützung für Echtzeit, simultane und verteilte 
+ Programmierung;
+ Für die Entwicklung von robusten und fortlaufend bearbeiteten Programmen
+ konzipiert;
+ Dynamische Ersetzung von Code zur Laufzeit.
+ .
+ Dieses Paket enthält alles was zur Erstellung und Benutzung von Erlang-
+ Programmen benötigt wird.
+Description-ja: ?????????????????????
+ Open Source Erlang ???????????????Ericcson Computer
+ Science Laboratory ?????????
+ .
+ Erlang ????????????:
+  ????????????????????????
+  ???????????????????????????????
+  ?????????????????????????
+  ?????????????
+ .
+ ?????????Erlang ??????????????????????
+ ???????
+
+Package: erlang-base
+Architecture: any
+Recommends: erlang
+Depends: debconf (>=0.4.00), ${shlibs:Depends}
+Conflicts: erlang (<< ${Source-Version})
+Replaces: erlang (<< ${Source-Version})
+Description: Erlang base system (virtual machine)
+ Open Source Erlang is a functional programming language designed at
+ the Ericcson Computer Science Laboratory.
+ .
+ Some of Erlang's main features are:
+  Clear declarative syntax and is largely free from side-effects;
+  Builtin support for real-time, concurrent and distributed programming;
+  Designed for development of robust and continously operated programs;
+  Dynamic code replacement at runtime.
+ .
+ This package contains the architecture-specific runtime implementation.
+Description-de: Erlang: Architektur-unabhängige Dateien
+ Freies Erlang ist eine funktionelle Programmiersprache vom Ericcson
+ Computer Science Laboratory.
+ .
+ Einige von Erlangs wichtigen Merkmalen:
+  klarer deklaratorischer Syntax weitgehend frei von Seiten-Effekten;
+  bereits integrierte Unterstützung von Echtzeit-, konkurrierender und
+   verteilter Programmierung;
+  konzipiert für die Entwicklung von robusten und immer arbeitenden
+   Programmen;
+  dynamischer Code-Austausch während der Laufzeit.
+ .
+ Dieses Paket enthält alle Architektur-unabhängigen Dateien von Erlang
+ runtime (d.h. was zum Ausführen nicht aber zum Programmieren benötigt
+ wird).
+Description-es: Archivos de Erlang independientes de arquitectura.
+ Open Source Erlang es un funcional lenguaje de programación creado en
+ los Laboratorios de Ciencias Computacionales de Ericcson.
+ .
+ Algunas de
+ las principales prestaciones de Erlang son: Clara sintaxis declarativa y
+ ampliamente libre de efectos colaterales; Soporte integrado para
+ programación en tiempo real, concurrente y distribuída; Creado para el
+ desarrollo de programas robustos y que estén operando contínuamente;
+ Sustitución dinámica del código en tiempo de ejecución.
+ .
+ Este paquete
+ contiene todos los archivos para Erlang independientes de la
+ arquitectura.
+Description-ja: ?????????????????????
+ Open Source Erlang ???????????????Ericcson Computer Science
+ Laboratory ?????????
+ .
+ Erlang ????????????:
+  ????????????????????????
+  ???????????????????????????????
+  ?????????????????????????
+  ?????????????
+ 
--- erlang-10.b.1a.orig/debian/changelog
+++ erlang-10.b.1a/debian/changelog
@@ -0,0 +1,388 @@
+erlang (1:10.b.1a-2) unstable; urgency=low
+
+  * Rebuild with corrected pathnames to libraries (remove duplicates).
+  * Compiled with -fPIC to support RISC (among others).
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Wed, 24 Nov 2004 20:07:57 -0800
+
+erlang (1:10.b.1a-1) unstable; urgency=low
+
+  * New upstream release:
+    - Compiler optimizations.
+    - Runtime memory use error.
+    - Better support for the new try/catch syntax.
+    - Emulator crash with bignums corrected.
+    - HIPE updated to correct a bug that caused the emulator to crash.
+  * Added a 'conflicts' with libxmerl-erlang, since 'xmerl' is now
+    distributed with Erlang OTP.  Perhaps we need some way to allow this
+    to be upgraded if xmerl has interim releases...
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Fri, 19 Nov 2004 23:36:41 -0800
+
+erlang (1:10.b.0-2) unstable; urgency=low
+
+  * Fix erlc:  VSN value changed and I didn't catch it.  Revised build
+    script to extract correct version from sources so I don't make this
+    mistake again.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun, 10 Oct 2004 14:01:06 -0700
+
+erlang (1:10.b.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Numbering now matches upstream.
+  * Correct package description duplication.  (Closes:#275595)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Wed,  6 Oct 2004 22:07:42 -0700
+
+erlang (1:9.2.2-6) unstable; urgency=low
+
+  * Include crypto support.  (Closes:#270629)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Mon, 27 Sep 2004 21:12:45 -0700
+
+erlang (1:9.2.2-5) unstable; urgency=low
+
+  * Correct s390 build bug (autoconf/config.guess returns triplet
+    s390-ibm-linux, rather than the s390-ibm-linux-gnu expected by
+    config.sub and others.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Thu,  2 Sep 2004 00:29:45 -0700
+
+erlang (1:9.2.2-4) unstable; urgency=low
+
+  * A few more cleanups.  (Closes:#263590).
+  * Add lintian-override for binaries-without-manpage, since these
+    manpages are all provided in the erlang-manpages package.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 28 Aug 2004 17:12:12 -0700
+
+erlang (1:9.2.2-3) unstable; urgency=low
+
+  * Build with Tcl/Tk 8.4 to be more "modern".
+  * Provide better cleanup.  Thanks to David N. Welton for
+    the fix.  (Closes#263590).
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Fri,  6 Aug 2004 23:36:28 -0700
+
+erlang (1:9.2.2-2) unstable; urgency=low
+
+  * Include dependency on Tcl/Tk 8.3 to allow gs to work.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 31 Jul 2004 18:53:58 -0700
+
+erlang (1:9.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Highlights:  Some performance improvements, some bug fixes.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Thu, 24 Jun 2004 22:49:25 -0700
+
+erlang (1:9.2.1-5) unstable; urgency=low
+
+  * Before someone files a bug:  ecc conflicts with elastiC, so
+    change link to "erl-ecc".
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 19 Jun 2004 09:24:24 -0700
+
+erlang (1:9.2.1-4) unstable; urgency=low
+
+  * A few straggling links to ear, escript.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun, 13 Jun 2004 00:55:23 -0700
+
+erlang (1:9.2.1-3) unstable; urgency=low
+
+  * Ugh!  Links didn't get picked up after the migration of platform
+    independent files.  (Closes:#253988)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 12 Jun 2004 09:25:40 -0700
+
+erlang (1:9.2.1-2) unstable; urgency=low
+
+  * Make upgrade easier.  (Closes:#253914)
+  * Clean up various lintian warnings.  (Made icon 32x32)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Fri, 11 Jun 2004 23:42:45 -0700
+
+erlang (1:9.2.1-1) unstable; urgency=low
+
+  * New upstream release.(Closes:#253116)
+  * Correct Emacs handling.  (Closes:#240235).
+  * Never uploaded 9.2-6 -- make sure (Closes:#237653)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Wed,  9 Jun 2004 22:57:36 -0700
+
+erlang (1:9.2-6) unstable; urgency=low
+
+  * Reconfigure a few things:  Make the 'erlang' package hold the
+    architecture-independent files.  Make the 'erlang-base' package hold
+    the base virtual machine (platform-dependent).
+  * Remove duplicates where possible.  (Closes:#237653)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Mon, 15 Mar 2004 21:10:42 -0800
+
+erlang (1:9.2-5) unstable; urgency=low
+
+  * Regenerate configure stuff in the hopes that this will help HPPA builds.
+  * Updated config.guess, config.sub to most recent version for autoconf2.13
+    series.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Mon,  9 Feb 2004 21:37:33 -0800
+
+erlang (1:9.2-4) unstable; urgency=low
+
+  * Add ia64 to buildable architectures (now that it builds!).
+    (Closes:#142642, #161266, #225226)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun,  8 Feb 2004 00:33:38 -0800
+
+erlang (1:9.2-3) unstable; urgency=low
+
+  * Minor fixes to build packages.
+  * Incorporate Daniel Schepler's patch (Closes:#196247)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat,  8 Nov 2003 21:00:56 -0800
+
+erlang (1:9.2-2) unstable; urgency=low
+
+  * Correct bad 'WWW' path.  (Closes:#207375).
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Wed, 27 Aug 2003 23:41:08 -0700
+
+erlang (1:9.2-1) unstable; urgency=low
+
+  * The Erlang 9RC Release.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Thu, 14 Aug 2003 21:25:25 -0700
+
+erlang (1:9.1-3) unstable; urgency=low
+
+  * Declare platform dependencies only on architectures supported by upstream.
+    The proper place for these to be fixed is in a real porting effort, not
+    by keeping Erlang out of stable.
+    (Closes:#142642), (Closes:#161266), (Closes:#179803), (Closes:#189591)
+  * Correct bad symlink to epmd (among others).  (Closes:#196268)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Mon, 23 Jun 2003 23:30:16 -0700
+
+erlang (1:9.1-2) unstable; urgency=low
+
+  * Incorporate Laurent Bonnaud's patch for allowing the Erlang mode to
+    work under XEmacs.  (Closes:#179277)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Tue, 18 Mar 2003 21:43:28 -0800
+
+erlang (1:9.1-1) unstable; urgency=low
+
+  * New upstream release.  Highlights:
+    + Constant expressions now evaluated at compile time.
+    + "," and "and" guards now handled properly.
+    + Corrections for floating point problems.
+    + Some 64-bit architecture fixes.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Fri, 14 Mar 2003 22:19:50 -0800
+
+erlang (1:9.0-10) unstable; urgency=low
+
+  * Correct settings of ERLDIR to not include quotes.  This corrects a problem
+        that kept Yaws from building properly "out of the box."  A tip 'o the
+        hat to Jimmie Houchin for noticing.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun,  2 Mar 2003 20:33:22 -0800
+
+erlang (1:9.0-9) unstable; urgency=low
+
+  * Add conflicts to elastic-base.  (Closes:Bug#179816)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Tue,  4 Feb 2003 22:11:08 -0800
+
+erlang (1:9.0-8) unstable; urgency=low
+
+  * Remove dangling symlinks from bad earlier package.  (Closes:#170528)
+  * Remove HIPE support for SPARC.  SPARC only supports HIPE under
+    SOLARIS (for now), so this causes build failures.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun,  2 Feb 2003 20:38:37 -0800
+
+erlang (1:9.0-7) unstable; urgency=low
+
+  * HPPA built on Paer, so I'm opening up the architecture to 'any'.
+  * Changed 'gawk' dependency to plain 'awk'.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat,  1 Feb 2003 23:09:23 -0800
+
+erlang (1:9.0-6) unstable; urgency=low
+
+  * Erlang won't build on other architectures because of my monkeying
+    around with 'ecc'.  Too many scripts depende on it being named
+    'ecc' and located in /usr/bin/ecc.  And I'm not sure how many
+    external Erlang programs make this assumption.  Going back to
+    conflicting with Elastic.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat,  1 Feb 2003 10:29:31 -0800
+
+erlang (1:9.0-5) unstable; urgency=low
+
+  * Fix some lintian warnings.
+  * Move all Java stuff into erlang-base, declare as binary-indep, and
+    remove build-depends on Java (since autobuilders don't need to build
+    these parts.)  Since the java-stuff is not critical to the function
+    of Erlang, modify build rules to ignore failure if 'javac' does not
+    exist, for example.
+  * Incorporated translations for German, Spanish, and Japanese.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Thu, 30 Jan 2003 21:46:22 -0800
+
+erlang (1:9.0-4) unstable; urgency=low
+
+  * More fun with 'ecc'.  I stupidly copied this into my own /usr/bin, so of
+    course everything works just fine on my system.  I figured out where this
+    is referenced in the erlc source and *hopefully* have this fixed so it
+    can coexist with the 'elastic' compiler.  (Closes: #172931)
+  * Changed dependency to xlibs-dev (Closes: #170156)
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 14 Dec 2002 16:52:18 -0800
+
+erlang (1:9.0-3) unstable; urgency=low
+
+  * Well, it appears bad paths continue to be a problem.  With some
+    messy sed scripts, this is now corrected.  "INSTALL_PREFIX" does
+    not seem to be honored by the installation rules from Ericsson
+    (unfortunately).
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Wed, 13 Nov 2002 23:31:55 -0800
+
+erlang (1:9.0-2) unstable; urgency=low
+
+  * Correct a link to empd in the runtime.
+  * Provide a menu entry.
+  * Add a conflict with the 'elastic' compiler, which also defines
+    a /usr/bin/ecc. (Closes:Bug#168407)
+  * Use "INSTALL_PREFIX" to avoid all of those bad paths in the compiled
+    scripts.  Surprised no one saw this!
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sun, 10 Nov 2002 00:00:51 -0800
+
+erlang (1:9.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Thu,  7 Nov 2002 21:15:57 -0800
+
+erlang (1:8.2-1) unstable; urgency=low
+
+  * New maintainer.
+  * New upstream version.
+  * Correct a few lintian warnings, eject 'java' package that caused the
+    Debian install system to complain.
+
+ -- Brent A. Fulgham <bfulgham@debian.org>  Sat, 10 Aug 2002 23:16:47 -0700
+
+erlang (49.1-10.1) stable; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply patch for double-free bug to included copy of zlib
+
+ -- Matt Zimmerman <mdz@debian.org>  Thu, 14 Feb 2002 04:38:23 +0000
+
+erlang (49.1-10) frozen unstable; urgency=low
+
+  * Incorporate bug fixes only from upstream maintainer. The bug could lead
+    in database deadlock in some situations.
+
+ -- Samuel Tardieu <sam@debian.org>  Sun, 27 Feb 2000 15:27:34 +0100
+
+erlang (49.1-9) frozen unstable; urgency=low
+
+  * Add a tiny patch to avoid a duplicate case clause on Sparc, because the
+    latest /usr/include/asm/signal.h files have the same value for
+    SIGLOST and SIGPWR. Closes an unreported important bug (this package
+    could not be rebuilt on Sparc). This 4 lines patch is the only code
+    change in this revision.
+  * Add libncurses5-dev to the Build-Depends list. Closes: #58151.
+  * Remove c-shell from the Depends list. Closes: #58152.
+
+ -- Samuel Tardieu <sam@debian.org>  Tue, 15 Feb 2000 13:58:41 +0100
+
+erlang (49.1-8) frozen unstable; urgency=low
+
+  * Apply latest upstream patches for the build process.
+    Closes: #57349, #57350. No new functionality has been added.
+
+ -- Samuel Tardieu <sam@debian.org>  Tue,  8 Feb 2000 13:38:34 +0100
+
+erlang (49.1-7) frozen unstable; urgency=low
+
+  * Remove Alpha from list of supported targets. Obviously, this code is
+    32 bits specific. Closes: #55237.
+
+ -- Samuel Tardieu <sam@debian.org>  Mon, 17 Jan 2000 17:11:31 +0100
+
+erlang (49.1-6) unstable; urgency=low
+
+  * Remove the etkdir.dpatch patch as it is not necessary.
+
+ -- Samuel Tardieu <sam@debian.org>  Mon, 13 Dec 1999 13:05:11 +0100
+
+erlang (49.1-5) unstable; urgency=low
+
+  * Apply patch from upstream to build Erlang libraries with proper dynamic
+    flags.
+  * Apply patch from upstream to put etk in the right directory.
+
+ -- Samuel Tardieu <sam@debian.org>  Sat, 11 Dec 1999 16:59:37 +0100
+
+erlang (49.1-4) unstable; urgency=low
+
+  * Add a patch to fix multicast bug. Submitted to upstream authors.
+
+ -- Samuel Tardieu <sam@debian.org>  Wed,  8 Dec 1999 18:48:31 +0100
+
+erlang (49.1-3) unstable; urgency=low
+
+  * Add Pre-Depends lines for dpkg.
+  * Apply unofficial patch for building ETK library.
+  * Change status of two patches from unofficial to official.
+  * Apply official patch for fixing netadm functions.
+
+ -- Samuel Tardieu <sam@debian.org>  Mon,  6 Dec 1999 13:14:50 +0100
+
+erlang (49.1-2) unstable; urgency=low
+
+  * Split this file into different package, to avoid duplication of
+    architecture independent files.
+  * Remove dependency on java. Closes: #51383.
+  * Remove hard-coded path inherited at installation time.
+
+ -- Samuel Tardieu <sam@debian.org>  Mon, 29 Nov 1999 15:42:55 +0100
+
+erlang (49.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * New maintainer.
+  * New packages.
+
+ -- Samuel Tardieu <sam@debian.org>  Thu, 25 Nov 1999 11:26:58 +0100
+
+erlang (47.4.1-2) unstable; urgency=low
+
+  * Closed bugs: #38119, #38265 - sparc, alpha ports and clean target.
+  
+ -- Mark Ng <ng@debian.org>  Mon,  21 Jun 1999 21:45:00 +1100
+
+erlang (47.4.1-1) unstable; urgency=low
+
+  * the .erl files now have their own package, giving a total of 5 packages.
+  * moved the .jam files and docs into their arch independant packages.
+  * New upsteam release.
+  
+ -- Mark Ng <ng@debian.org>  Sat,  8 May 1999 16:45:00 +1100
+
+erlang (47.4.0-1) unstable; urgency=low
+
+  * Initial Release.
+  * Split into  -base and -dev packages
+  * Erlang sources for libraries and tools are removed from the bin dist.
+
+ -- Mark Ng <ng@debian.org>  Thu,  4 Feb 1999 23:21:00 +1100
--- erlang-10.b.1a.orig/debian/erlang.dirs
+++ erlang-10.b.1a/debian/erlang.dirs
@@ -0,0 +1,50 @@
+usr/bin
+usr/lib/erlang/usr/lib
+usr/lib/erlang/usr/include
+usr/lib/erlang/erts-5.4.2.1/bin
+usr/lib/erlang/misc
+usr/lib/erlang/releases
+usr/lib/erlang/lib/stdlib-1.13.2
+usr/lib/erlang/lib/snmp-4.0.2
+usr/lib/erlang/lib/ssh-0.2
+usr/lib/erlang/lib/sasl-2.0
+usr/lib/erlang/lib/kernel-2.10.2
+usr/lib/erlang/lib/compiler-4.3.1
+usr/lib/erlang/lib/appmon-2.1.3
+usr/lib/erlang/lib/asn1-1.4.4.3
+usr/lib/erlang/lib/tools-2.4
+usr/lib/erlang/lib/erl_interface-3.5
+usr/lib/erlang/lib/jinterface-1.3
+usr/lib/erlang/lib/debugger-2.3
+usr/lib/erlang/lib/gs-1.5.3
+usr/lib/erlang/lib/inets-4.0
+usr/lib/erlang/lib/ic-4.2.7
+usr/lib/erlang/lib/mnesia-4.2
+usr/lib/erlang/lib/mnemosyne-1.2.5
+usr/lib/erlang/lib/mnesia_session-1.1.5
+usr/lib/erlang/lib/observer-0.9.6
+usr/lib/erlang/lib/crypto-1.2.1
+usr/lib/erlang/lib/orber-3.5.3
+usr/lib/erlang/lib/os_mon-1.7.1
+usr/lib/erlang/lib/otp_mibs-1.0.4
+usr/lib/erlang/lib/pman-2.5.1
+usr/lib/erlang/lib/ssl-3.0.4
+usr/lib/erlang/lib/toolbar-1.2
+usr/lib/erlang/lib/tv-2.1
+usr/lib/erlang/lib/runtime_tools-1.5
+usr/lib/erlang/lib/cosTransactions-1.2
+usr/lib/erlang/lib/cosEvent-2.1
+usr/lib/erlang/lib/cosEventDomain-1.1
+usr/lib/erlang/lib/cosTime-1.1
+usr/lib/erlang/lib/cosNotification-1.1.1
+usr/lib/erlang/lib/cosProperty-1.1.1
+usr/lib/erlang/lib/cosFileTransfer-1.1.2
+usr/lib/erlang/lib/megaco-2.1.6
+usr/lib/erlang/lib/webtool-0.8.2
+usr/lib/erlang/lib/odbc-2.0.2
+usr/lib/erlang/lib/hipe-3.0
+usr/lib/erlang/lib/et-1.0
+usr/share/emacs/site-lisp/erlang
+usr/share/doc/erlang
+usr/share/icons
+usr/share/lintian/overrides/erlang