--- inform-6.31.1+dfsg.orig/inform-6.31.1/config/config.sub
+++ inform-6.31.1+dfsg/inform-6.31.1/config/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2009-04-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -119,8 +120,10 @@
 # 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +174,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +194,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,20 +242,24 @@
 	| 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 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -257,26 +272,26 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m32c)
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -286,6 +301,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,25 +323,28 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -336,30 +357,33 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
-	m32c-*)
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -423,6 +447,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -431,10 +459,22 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -463,8 +503,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -502,6 +542,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -656,6 +700,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -671,6 +723,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -696,6 +752,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -794,6 +853,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -803,6 +870,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +932,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +962,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -896,6 +977,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -985,6 +1069,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1060,6 +1148,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1098,10 +1190,10 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1170,25 +1262,28 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -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* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -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* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1318,6 +1413,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1340,6 +1438,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1349,9 +1453,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1377,6 +1481,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
--- inform-6.31.1+dfsg.orig/inform-6.31.1/config/config.guess
+++ inform-6.31.1+dfsg/inform-6.31.1/config/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2009-04-27'
 
 # 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
@@ -55,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@
 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" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$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 ; } ;
@@ -160,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -319,14 +324,30 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -527,7 +548,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -764,12 +785,19 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -779,9 +807,18 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd | genuineintel)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -794,7 +831,7 @@
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -815,6 +852,16 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -851,7 +898,11 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,9 +921,16 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -893,6 +951,9 @@
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -916,9 +977,15 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -937,9 +1004,6 @@
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -961,7 +1025,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -971,7 +1035,11 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1050,8 +1118,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1089,6 +1160,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1164,6 +1245,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1173,6 +1257,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1182,7 +1275,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1261,6 +1353,12 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1421,9 +1519,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- inform-6.31.1+dfsg.orig/debian/inform-docs.doc-base.ibg
+++ inform-6.31.1+dfsg/debian/inform-docs.doc-base.ibg
@@ -0,0 +1,10 @@
+Document: inform-dm4
+Title: Inform Beginner's Guide
+Author: Roger Firth and Sonja Kesserich
+Abstract: This manual gives a thorough introduction into
+ the basic programming concepts of the Inform interactive
+ fiction language (version 6).
+Section: Games/Adventure
+
+Format: PDF
+Files: /usr/share/doc/inform-docs/inform_BG.pdf.gz
--- inform-6.31.1+dfsg.orig/debian/inform.install
+++ inform-6.31.1+dfsg/debian/inform.install
@@ -0,0 +1,7 @@
+inform-6.31.1/src/inform usr/bin
+debian/inform.1 usr/share/man/man1
+inform-6.31.1/include/*.h usr/share/inform/6.31/include
+inform-6.31.1/include/*.inf usr/share/inform/6.31/include
+inform-6.31.1/lib/*.h usr/share/inform/6.31/module
+inform-6.31.1/lib/*.m5 usr/share/inform/6.31/module
+inform-6.31.1/demos/*.inf usr/share/doc/inform/demos
--- inform-6.31.1+dfsg.orig/debian/README.Debian-source
+++ inform-6.31.1+dfsg/debian/README.Debian-source
@@ -0,0 +1,72 @@
+The Debian tarball consists of the following components:
+  * The Inform 6.31 tarball, available at the IF Archive at
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-6.31.1.tar.gz
+  * The Inform Beginner's Guide and the Inform Designer Manual, available at
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/IBG.pdf
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/designers_manual_4.pdf
+
+Several files were removed from the Inform 6.31 tarball due to missing or
+unclear licensing and redistribution terms. These are:
+  * the tutor/ subdirectory
+  * several user-supplied modules from the include/ directory:
+    * action.h
+    * adhints.*
+    * altmenu.h
+    * boxclever.h
+    * branch.h
+    * ccpl.h
+    * center.h
+    * clothes.h
+    * clothing.h
+    * compass.h
+    * diary.h
+    * dirs.h
+    * domenu.h
+    * doors.h
+    * dynobj.h
+    * expertgrammar.h
+    * fkeys.h
+    * follower.h
+    * footnote.h
+    * goneighbour.h
+    * helproutines.h
+    * hints.h
+    * howtoplay.h
+    * info.h
+    * istring.h
+    * locksmith.h
+    * manual.h
+    * menus.h
+    * mistype.h
+    * moveclass.h
+    * movie.h
+    * newmenu.h
+    * newmenus.h
+    * npc_engine.*
+    * oldaemon.h
+    * outofrch.h
+    * phtalkoo.h
+    * physics.h
+    * pluralob.h
+    * pname.*
+    * recept.h
+    * sampletranscript.h
+    * scenic.h
+    * scoper.h
+    * showobj.h
+    * shuffle.h
+    * smartcantgo.h
+    * sound.h
+    * style.h
+    * text_functions.*
+    * timesys.h
+    * timewait.h
+    * torch.h
+    * utility.h
+    * waittime.h
+    * whowhat.h
+    * yesno.h
+    * zclock.h
+    * znsi.h
+
+-- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>, May 24 2008
--- inform-6.31.1+dfsg.orig/debian/Makefile.upstream
+++ inform-6.31.1+dfsg/debian/Makefile.upstream
@@ -0,0 +1,16 @@
+SRC := $(wildcard *.c)
+OBJ := $(patsubst %.c,%.o,$(SRC))
+
+.PHONY: clean all
+
+all: inform-6.31
+
+$(OBJ): %.o: %.c
+	gcc $(CFLAGS) -DLINUX -DInclude_Directory="\"/usr/share/inform-6.31/include,/usr/share/inform-6.31/modules\"" \
+	  -Wall -Wextra -Wno-uninitialized $^ -c -o $@
+
+inform-6.31: $(OBJ)
+	gcc $(CFLAGS) $^ -o $@
+
+clean:
+	rm -f *.o inform-6.31
--- inform-6.31.1+dfsg.orig/debian/changelog
+++ inform-6.31.1+dfsg/debian/changelog
@@ -0,0 +1,149 @@
+inform (6.31.1+dfsg-1ubuntu2) lucid; urgency=low
+
+  * debian/control: Fixed maintainer field and typo in XSBC-O-M.
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Mon, 21 Dec 2009 19:30:18 +0600
+
+inform (6.31.1+dfsg-1ubuntu1) lucid; urgency=low
+
+  * Removed alternatives configuration. (LP: #411523)
+
+ -- Maia Kozheva <sikon@ubuntu.com>  Wed, 16 Dec 2009 19:21:35 +0600
+
+inform (6.31.1+dfsg-1) unstable; urgency=low
+
+  * Remove a considerable number of files from the package
+    due to unacceptable licensing terms.
+  * Repair library symlinks.
+
+ -- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>  Mon, 26 May 2008 22:09:44 +0200
+
+inform (6.31.1-1) unstable; urgency=low
+
+  * At long last, adopt the package. Closes: #454258.
+  * Redo package from scratch. This package shall at least
+    survive the Lenny release, so this closes: #446664.
+  * New upstream version. Closes: #385718.
+  * Include latest Designer's Manual. Closes: #131968.
+  * Package is now policy-compliant with version 3.7.3.
+  * Bump debhelper level to 6.
+  * Obtain recent config.{sub,guess} at build time.
+  * Write a fully-fledged manpage.
+  * Add XS-Autobuild to control file.
+
+ -- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>  Thu, 01 May 2008 16:19:57 +0200
+
+inform (6.30-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload with maintainer consent.
+  * Finish /usr/doc transition (Closes: #406985).
+  * Test -x for update-menus (RC bug, closes: #289739).
+  * Don't install Makefile under /usr/share/info (Closes: #326991).
+  * Let inform suggest inform-docs.
+  * Fixed the following Lintian problems:
+    spelling-error-in-copyright,
+    description-synopsis-might-not-be-phrased-properly,
+    install-info-not-called-with-quiet-option,
+    menu-file-in-usr-lib, symlink-should-be-relative,
+    manpage-has-errors-from-man, configure-generated-file-in-source,
+    diff-contains-substvars, outdated-autotools-helper-file
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Fri, 16 Feb 2007 13:37:13 +0100
+
+inform (6.30-2) unstable; urgency=low
+
+  * Install include files (Closes: 381249)
+  * Other minor build/install changes
+  * Don't install emacs mode under /usr/doc; anyone who wants it should
+    install the inform-mode package
+
+ -- Mark Baker <mark@mnb.org.uk>  Fri, 25 Aug 2006 21:29:45 +0100
+
+inform (6.30-1) unstable; urgency=low
+
+  * New upstream release (Closes: #235665)
+  * This fixes problem building with recent versions of gcc (Closes: #235799)
+  * debian/doc.postinst etc: don't run update-menus unless it's installed
+  * debian/install.1: whatis should parse it OK now (Closes: #238018)
+
+ -- Mark Baker <mark@mnb.org.uk>  Mon, 29 Mar 2004 23:52:44 +0100
+
+inform (6.21-2.2) unstable; urgency=low
+
+  * NMU
+  * doc.postinst: Only call update-menus if it exists (closes: #126372).
+
+ -- Robert Bihlmeyer <robbe@debian.org>  Sun, 27 Oct 2002 08:56:31 +0100
+
+inform (6.21-2.1) unstable; urgency=low
+
+  * NMU
+  * Added build dependencies. (closes: #110382)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat, 10 Nov 2001 15:45:09 +0100
+
+inform (6.21-2) unstable; urgency=low
+
+  * debian/rules: lower case symlinks to library files. Unfortunately,
+    many inform users use it on other platforms that aren't
+    case-sensitive, so include the library files in all lower case; this
+    gives problems in unix as the real names are capitalised (Closes: #51149)
+  * debian/rules and others: move docs into /usr/share/doc (Closes:
+    #91505, #91181, #82408, #82409, #91493) 
+
+ -- Mark Baker <mark@mnb.org.uk>  Fri, 27 Apr 2001 22:41:29 +0100
+
+inform (6.21-1) unstable; urgency=low
+
+  * New upstream version
+  * New upstream libraries version 6/9 (#21494)
+  * New upstream info documentation, with answers 35-58 OK (#21495)
+
+ -- Mark Baker <mbaker@iee.org>  Mon,  5 Jul 1999 23:00:34 +0100
+
+inform (6.14-4) unstable; urgency=low
+
+  * Removed X- fields from control file to shut up lintian
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 28 Feb 1998 14:03:38 +0000
+
+inform (6.14-3) unstable; urgency=low
+
+  * inform-docs now depends on, instead of suggests, inform. This is a bad
+    thing, but is necessary to ensure the copyright file exists. The
+    alternative would be to make /usr/doc/inform-docs not a symlink to
+    /usr/doc/inform, but that would mean the documents would either not be
+    in /usr/doc/inform-docs, or not be in /usr/doc/inform, either of which
+    seems illogical to me.
+  * Fixed permissions (last time I "fixed" the wrong one of the two binary
+    packages)
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 10 Feb 1998 15:00:38 +0000
+
+inform (6.14-2) unstable; urgency=low
+
+  * Updated standards-version to 2.4.0.0
+  * Fixed permissions
+  * Made /usr/doc/inform-docs symlink to /usr/doc/inform
+  * Written a manpage
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 10 Feb 1998 15:00:38 +0000
+
+inform (6.14-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Mark Baker <mbaker@iee.org>  Sat, 11 Oct 1997 13:47:00 +0100
+
+inform (6.13-2) unstable; urgency=low
+
+  * Changed suggests: line to zcode-interpreter instead of infocom-interpreter
+  * Use menu to register the documentation instead of .dwww-lib file
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 17 Jun 1997 15:30:24 +0100
+
+inform (6.13-1) unstable; urgency=low
+
+  * First debian release
+
+ -- Mark Baker <mbaker@iee.org>  Tue, 29 Apr 1997 23:07:13 +0100
--- inform-6.31.1+dfsg.orig/debian/inform-docs.install
+++ inform-6.31.1+dfsg/debian/inform-docs.install
@@ -0,0 +1,3 @@
+inform-6.31.1/manual/*.html usr/share/doc/inform-docs/DM4
+inform-6.31.1/manual/*.jpg usr/share/doc/inform-docs/DM4
+inform*.pdf usr/share/doc/inform-docs
--- inform-6.31.1+dfsg.orig/debian/inform.links
+++ inform-6.31.1+dfsg/debian/inform.links
@@ -0,0 +1,5 @@
+/usr/share/inform/6.31/module/parser.h /usr/share/inform/6.31/module/Parser.h
+/usr/share/inform/6.31/module/verblib.h /usr/share/inform/6.31/module/VerbLib.h
+/usr/share/inform/6.31/module/verblib.h /usr/share/inform/6.31/module/Verblib.h
+/usr/share/inform/6.31/module/english.h /usr/share/inform/6.31/module/English.h
+/usr/share/inform/6.31/module/grammar.h /usr/share/inform/6.31/module/Grammar.h
--- inform-6.31.1+dfsg.orig/debian/rules
+++ inform-6.31.1+dfsg/debian/rules
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build.stamp unpack.stamp
+	[ ! -f inform-6.31.1/Makefile ] || $(MAKE) -C inform-6.31.1 maintainer-clean
+	dh_clean
+
+unpack: unpack.stamp
+unpack.stamp:
+	dh_testdir
+	cp /usr/share/misc/config.sub /usr/share/misc/config.guess \
+	  inform-6.31.1/config/
+	touch unpack.stamp
+
+build: unpack build.stamp
+build.stamp:
+	dh_testdir
+	cd inform-6.31.1 && ./configure --prefix=/usr
+	$(MAKE) -C inform-6.31.1
+	touch build.stamp
+
+binary: binary-arch binary-indep
+binary-indep:
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_install
+	dh_installdocs
+	dh_installchangelogs
+	dh_fixperms
+	dh_strip
+	dh_link
+	dh_compress
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_builddeb
+
+.PHONY: clean unpack build binary binary-arch binary-indep
--- inform-6.31.1+dfsg.orig/debian/inform-docs.doc-base.dm4
+++ inform-6.31.1+dfsg/debian/inform-docs.doc-base.dm4
@@ -0,0 +1,13 @@
+Document: inform-dm4
+Title: Inform Designer's Manual (4th edition)
+Author: Graham Nelson
+Abstract: This is the complete reference to the Inform interactive
+ fiction language (version 6).
+Section: Games/Adventure
+
+Format: HTML
+Index: /usr/share/doc/inform-docs/DM4/index.html
+Files: /usr/share/doc/inform-docs/DM4/*.html
+
+Format: PDF
+Files: /usr/share/doc/inform-docs/inform_DM4.pdf.gz
--- inform-6.31.1+dfsg.orig/debian/copyright
+++ inform-6.31.1+dfsg/debian/copyright
@@ -0,0 +1,259 @@
+This Debian package was created by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>.
+All packaging work is licensed under the GPL.
+
+(I) Construction of the repackaged Debian tarball
+
+The Debian tarball consists of the following components:
+  * The Inform 6.31 tarball, available at the IF Archive at
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-6.31.1.tar.gz
+  * The Inform Beginner's Guide and the Inform Designer Manual, available at
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/IBG.pdf
+    ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/designers_manual_4.pdf
+
+Several files were removed from the Inform 6.31 tarball due to missing or
+unclear licensing and redistribution terms. These are:
+  * the tutor/ subdirectory
+  * several user-supplied modules from the include/ directory:
+    * action.h
+    * adhints.h, adhints.txt
+    * altmenu.h
+    * boxclever.h
+    * branch.h
+    * ccpl.h
+    * center.h
+    * clothes.h
+    * clothing.h
+    * compass.h
+    * diary.h
+    * dirs.h
+    * domenu.h
+    * doors.h
+    * dynobj.h
+    * expertgrammar.h
+    * fkeys.h
+    * follower.h
+    * footnote.h
+    * goneighbour.h
+    * helproutines.h
+    * hints.h
+    * howtoplay.h
+    * info.h
+    * istring.h
+    * locksmith.h
+    * manual.h
+    * menus.h
+    * mistype.h
+    * moveclass.h
+    * movie.h
+    * newmenu.h
+    * newmenus.h
+    * npc_engine.h, npc_engine.inf, npc_engine.txt
+    * oldaemon.h
+    * outofrch.h
+    * phtalkoo.h
+    * physics.h
+    * pluralob.h
+    * pname.h, pname.txt
+    * recept.h
+    * sampletranscript.h
+    * scenic.h
+    * scoper.h
+    * showobj.h
+    * shuffle.h
+    * smartcantgo.h
+    * sound.h
+    * style.h
+    * text_functions.h, text_functions.inf
+    * timesys.h
+    * timewait.h
+    * torch.h
+    * utility.h
+    * waittime.h
+    * whowhat.h
+    * yesno.h
+    * zclock.h
+    * znsi.h
+
+-- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>, May 24 2008
+
+(II) Copyright and license information
+
+Upstream homepage is at
+  http://www.inform-fiction.org/inform6.html
+This package has been assembled using the downloads of the IF archive at
+  ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/
+
+Copyright and License for the Inform compiler (inform-6.31.1/src, inform-6.31.1/config,
+inform-6.31.1/docs and the build files in inform-6.31.1/ itself), the library
+(inform-6.31.1/lib), the example games (inform-6.31.1/demos), and the Inform Designer's
+Manual (Inform_DM4.pdf and inform-6.31.1/manual):
+
+  Inform, the program and its source code, its example games and documentation,
+  including the text and typography of this book, are copyright (C) Graham Nelson 1993,
+  94, 95, 96, 97, 98, 99, 2000, 01.
+
+  The Inform software may be freely distributed provided that: (a) distributed copies
+  are not substantially different from those archived by the author, (b) this and other
+  copyright messages are always retained in full, and (c) no profit is involved. The
+  same conditions apply to distribution or conversion of any electronic form of this book
+  which may be made available by the author. Exceptions to these conditions must be
+  negotiated directly with the author.
+
+  A story file produced with the Inform system belongs to whoever wrote it and may be
+  sold for profit if so desired, without the need for royalty payment, provided that it prints
+  a game banner conforming to the standard library's banner at an early stage in play: in
+  particular, this banner must contain the information that the story file was compiled by
+  Inform, and the version numbers of compiler and library used.
+
+  The author assumes no liability for errors and omissions in this book, or for damages
+  or loss of revenue resulting from the use of the information contained herein, or the use
+  of any of the software described herein. Inform software is supplied ``as is'' and carries
+  no warranty, actual or implied.
+
+Copyright and License for the Inform Emacs Mode (inform-6.31.1/contrib):
+
+;; Copyright (c) by Gareth Rees 1996
+;; Portions copyright (c) by Michael Fessler 1997-1998
+;; Portions copyright (c) by Rupert Lane 1999-2000, 2002
+
+;; inform-mode is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; inform-mode is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+(This file is packaged separately and from a different upstream source, so it is not
+included in the binary packages that stem from this source package.)
+
+Copyright and License for the Inform Beginner's Guide (Inform_BG.pdf):
+
+  This book and its associated example games are copyright (C) Roger Firth and
+  Sonja Kesserich 2004. Their electronic forms may be freely distributed provided
+  that: (a) distributed copies are not substantially different from those archived by
+  the authors, (b) this and other copyright messages are always retained in full, and
+  (c) no profit is involved. Exceptions to these conditions must be negotiated
+  directly with the authors (roger@firthworks.com and polilla@idecnet.com).
+
+  The authors assume no liability for errors and omissions in this book, or for
+  damages or loss of revenue resulting from the use of the information contained
+  herein, or the use of any of the software described herein.
+
+Copyright and License for the user-supplied extensions (inform-6.31.1/include):
+
+  The files in /usr/share/inform/6.31/include have been written by a multitude of Inform users
+  and submitted to the IF Archive for redistribution and use by other authors. The original
+  Inform tarball (as available from the IF Archive) contains many more, but most of them had
+  to be removed from the Debian package due to unclear licensing and distribution terms (see
+  above).
+
+  This is the complete list of header files which are suitable for inclusion:
+
+  * calyx_adjectives.h
+  Author: Miron Schmidt / Calyx
+  Copyright: -
+  License:
+!       Written in 1997 by Miron Schmidt / Calyx. Placed in the
+!       Public Domain.
+
+  * daemons.h
+  Author: Roger Firth (roger.firth@tesco.net), Andrew Plotkin
+  Copyright: -
+  License:
+!   This file is in the public domain.
+
+  * easydoors.h
+  Author: Andrew MacKinnon
+  Copyright: copyright (c) 2000-2001 Andrew MacKinnon
+  License:
+! May be distributed freely, proprietary incorporation allowed
+! May be embedded in any game file created with Inform
+! Credit for use is appreciated but not required
+
+  * hintsms.h
+  Author: Peer Schaefer
+  Copyright: copyright (c) 2001 by Peer Schaefer
+  License:
+! Unaltered distribution of this sourcecode without profit allowed.
+! Use it freely within your own games, commercial or otherwise.
+! It would be nice if you give me some credit, but it's not required.
+!
+! NO WARRANTY, NO LIABILITY. PROVIDED "AS IS". USE ON YOUR OWN RISK!
+
+  * links.h, links.inf
+  Author: Jayson Smith
+  Copyright: -
+  License:
+!This library and the sample game may be distributed freely.  Having said
+!that, if you use any of this code in a game, I'd appreciate at least a
+!"Thank you" in your game.
+
+  * longint.h
+  Author: Chris Hall <c@pobox.co.uk>, Francis Irving <francis@pobox.co.uk>
+  Copyright: Copyright 1997-1998 Chris Hall and Francis Irving
+  License:
+! This source code is distributed free, but remains
+! Copyright 1997-1998 Chris Hall and Francis Irving.  Release 1.
+
+  * money.h
+  Author: Erik Hetzner <egh@uclink4.berkeley.edu>
+  Copyright:
+!! Copyright 1997 Erik Hetzner
+  License:
+!! This file may be copied, modified and distributed freely, so long
+!! as this notice remains. If it is modified, I ask that you change
+!! the name somehow to indicate that changes have been made, and give
+!! both you and me credit. You may include this library in any game so
+!! long as you give me credit somewhere.
+
+  * nameable.h
+  Author: John Colagioia (JColagioia@csi.com)
+  Copyright: -
+  License:
+! Note:  With no licensing notice to the contrary in "Balances," it can be expected
+! to be under copyright.  Therefore, the portions of this code should be considered
+! as such until notified otherwise by Graham Nelson.  Any modifications to that code
+! made by John Colagioia, however, are in the Public Domain, for whatever that's
+! worth.
+
+  * newbiegrammar.h
+  Author: Emily Short <emshort@mindspring.com>
+  Copyright: -
+  License:
+!       This library file may be treated as public domain.  It may be
+!       included with or without credit to the original author.  It may be
+!       modified at the user's discretion.  It may be freely redistributed.  
+
+  * printtime.h, timepiece.h
+  Author: Erik Hetzner <egh@raisin.bagel.org>
+  Copyright: Copyright 1996 Erik Hetzner
+  License:
+!! This program (can it be called that?) is released in the hopes
+!! that it will be useful, but without a warranty of any kind.
+!! It is distributed under the GNU General Public License.
+!! This license is available at `ftp://prep.ai.mit.edu/pub/gnu/COPYING'
+
+(In 1996, GPL version 2 was current. The link is dead.)
+
+  * trinitystat.h
+  Author: Jonathan Rosebaugh
+  Copyright: Copyright (C) 2000 by Jonathan Rosebaugh
+  License:
+! Copyright (C) 2000 by Jonathan Rosebaugh. Released under GPL version 2.
+! see http://www.gnu.org/copyleft/gpl.html
+
+  * whatis.h
+  Author: A. C. Murie
+  Copyright: Copyright 1996 A.C. Murie
+  License:
+!             This code may be freely distributed and used in any
+!             program, commercial or otherwise. It would be nice if you
+!             give me some credit, but it is not required. Feel free to
+!             modify it if you want.
+
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
--- inform-6.31.1+dfsg.orig/debian/compat
+++ inform-6.31.1+dfsg/debian/compat
@@ -0,0 +1 @@
+6
--- inform-6.31.1+dfsg.orig/debian/inform.1
+++ inform-6.31.1+dfsg/debian/inform.1
@@ -0,0 +1,230 @@
+.TH INFORM "1" "2008-04-27" "Inform v6.31" "Inform v6.31 - interactive fiction story file compiler"
+.SH NAME
+inform \- compile Inform interactive fiction story files to Z-machine bytecode
+.SH SYNOPSIS
+.BI "inform " "[options...] infile [outfile]"
+.SH DESCRIPTION
+\fBinform\fP compiles an Inform version 6 story file (usually with the
+extension \fB.inf\fP) into Z-machine bytecode which can then be
+executed by a variety of Z-machine emulators. If the output filename is not
+explicitly given on the command line, it will be constructed from the input
+filename.
+.PP
+\fBinform\fP's mode of operation can be controlled with switches (one- or
+two-character expressions preceded by a dash), path modifiers (starting with a
+plus sign) and memory strategy modifiers (starting with a dollar sign).
+.SS SWITCHES
+.TP
+.B -a
+trace assembly-language (without hex dumps; see \fB-t\fP)
+.TP
+.B -c
+more concise error messages
+.TP
+.B -d
+contract double spaces after full stops in text
+.TP
+.B -d2
+contract double spaces after exclamation and question marks, too
+.TP
+.B -e
+economy mode (slower): make use of declared abbreviations
+.TP
+.B -f
+frequencies mode: show how useful abbreviations are
+.TP
+.B -g
+traces calls to functions (except in the library)
+.TP
+.B -g2
+traces calls to all functions
+.TP
+.B -h, -h1, -h2
+print usage information
+.TP
+.B -i
+ignore default switches set within the file
+.TP
+.B -j
+list objects as constructed
+.TP
+.B -k
+output Infix debugging information to "gameinfo.dbg" (and switch \fB-D\fP on)
+.TP
+.B -l
+list every statement run through Inform
+.TP
+.B -m
+say how much memory has been allocated
+.TP
+.B -n
+print numbers of properties, attributes and actions
+.TP
+.B -o
+print offset addresses
+.TP
+.B -p
+give percentage breakdown of story file
+.TP
+.B -q
+keep quiet about obsolete usages
+.TP
+.B -r
+record all the text to "gametext.txt"
+.TP
+.B -s
+give statistics
+.TP
+.B -t
+trace assembly-language (with full hex dumps; see \fB-a\fP)
+.TP
+.B -u
+work out most useful abbreviations (very very slowly)
+.TP
+.B -v\fIn\fP
+compile to a specific Z-code version; the default is 5. Available versions are:
+.RS
+.TP
+.B 3
+version-3 ("Standard") story file
+.TP
+.B 4
+version-4 ("Plus") story file
+.TP
+.B 5
+version-5 ("Advanced") story file
+.TP
+.B 6
+version-6 (graphical) story file
+.TP
+.B 8
+version-8 (expanded "Advanced") story file
+.RE
+.TP
+.B -w
+disable warning messages
+.TP
+.B -x
+print # for every 100 lines compiled
+.TP
+.B -y
+trace linking system
+.TP
+.B -z
+print memory map of the Z-machine
+.TP
+.B -B
+use big memory model (for large version-6/version-7 files)
+.TP
+.B -C\fIn\fP
+select text character set (defaults to 1):
+.RS
+.TP
+.B 0
+plain ASCII only
+.TP
+.B 1
+ISO 8859-1 (Latin1)
+.TP
+.B 2
+ISO 8859-2 (Latin2)
+.TP
+.B 3
+ISO 8859-3 (Latin3)
+.TP
+.B 4
+ISO 8859-4 (Latin4)
+.TP
+.B 5
+ISO 8859-5 (Cyrillic)
+.TP
+.B 6
+ISO 8859-6 (Arabic)
+.TP
+.B 7
+ISO 8859-7 (Greek)
+.TP
+.B 8
+ISO 8859-8 (Hebrew)
+.TP
+.B 9
+ISO 8859-9 (Latin5)
+.RE
+.TP
+.B -D
+insert "Constant DEBUG;" automatically
+.TP
+.B -E\fIn\fP
+select error message style (default is Archimedes):
+.RS
+.TP
+.B 0
+Archimedes-style error messages
+.TP
+.B 1
+Microsoft-style error messages
+.TP
+.B 2
+Macintosh MPW-style error messages
+.RE
+.TP
+.B -F1
+use temporary files to reduce memory consumption
+.TP
+.B -G
+compile a Glulx game file
+.TP
+.B -H
+use Huffman encoding to compress Glulx strings
+.TP
+.B -M
+compile as a Module for future linking
+.TP
+.B -S
+compile strict error-checking at run-time (on by default)
+.TP
+.B -U
+insert "Constant USE_MODULES;" automatically
+.TP
+.B -W\fIn\fP
+header extension table is at least n words (n = 3 to 99)
+.TP
+.B -X
+compile with INFIX debugging facilities present
+.SS PATH MODIFIERS
+.TP
+.BI + dir
+set \fBInclude_Path\fP to this directory
+.TP
+.BI +PATH= dir
+change \fBPATH\fP to this directory
+.SS MEMORY STRATEGY MODIFIERS
+Note: it may be necessary to quote these parameters to prevent your shell
+from expanding them.
+.TP
+.B $small
+adjust memory settings to a small game
+.TP
+.B $large
+adjust memory settings to a large game
+.TP
+.B $huge
+adjust memory settings to a huge game (default)
+.TP
+.B $list
+list current memory allocation settings
+.TP
+.BI $? parameter
+explain memory setting \fIparameter\fP (see \fB$list\fP for available
+parameters)
+.TP
+.BI $ parameter = value
+manually set \fIparameter\fP
+.SH SEE ALSO
+.IR zcode-interpreter (6)
+and the manuals and language reference in the \fBinform-docs\fP package, which
+can also be found online at
+.RI < http://www.inform-fiction.org/inform6.html >.
+.SH AUTHOR
+This manpage was written by Jan Nordholz <hesso@pool.math.tu-berlin.de> for the
+Debian distribution.
--- inform-6.31.1+dfsg.orig/debian/control
+++ inform-6.31.1+dfsg/debian/control
@@ -0,0 +1,40 @@
+Source: inform
+Section: non-free/devel
+Priority: extra
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 6), autotools-dev
+XS-Autobuild: yes
+
+Package: inform
+Section: non-free/devel
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: zcode-interpreter
+Suggests: inform-mode, inform-docs
+Description: story file compiler for the Inform interactive fiction language (v6)
+ Inform is an object-oriented language for text adventure games which
+ are commonly known as "interactive fiction". The story files are
+ compiled into a special form of bytecode (Z-code) which can then
+ be run by Z-code interpreters that exist for a multitude of
+ operating systems.
+ .
+ This package contains:
+  * the Inform compiler
+  * the Inform standard library
+  * several user-supplied extensions and modules 
+
+Package: inform-docs
+Section: non-free/doc
+Architecture: all
+Description: documentation for the Inform interactive fiction language (v6)
+ Inform is an object-oriented language for text adventure games which
+ are commonly known as "interactive fiction". The story files are
+ compiled into a special form of bytecode (Z-code) which can then
+ be run by Z-code interpreters that exist for a multitude of
+ operating systems.
+ .
+ This package contains:
+  * the Inform Designer's Manual (4th edition)
+  * the Inform Beginner's Guide