Does it really make sense to try to workaround the file replacement for a patch that will be overwritten, and never used? Please consider the attached patch which simply removes the useless changes to config.sub and config.guess from the internationalisation patch, and allows rebuilding without a backup & copy dance. The reason that the patches to config.sub and config.guess may be considered useless is that the files are overwritten after the patch is complete, so the results of the patch are never reflected in a build.
-- Emmet HIKORY
diff -u dillo-0.8.6/debian/patches/01_i18n dillo-0.8.6/debian/patches/01_i18n --- dillo-0.8.6/debian/patches/01_i18n +++ dillo-0.8.6/debian/patches/01_i18n @@ -8124,252 +8124,6 @@ + +/* vim: set ts=3 sw=3 sts=3 expandtab:*/ diff -pruN dillo-0.8.6/config.guess dillo-0.8.6-i18n-misc-20070916/config.guess ---- dillo-0.8.6/config.guess 2005-03-22 16:17:05.000000000 +0900 -+++ dillo-0.8.6-i18n-misc-20070916/config.guess 2006-05-16 01:21:07.000000000 +0900 -@@ -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, 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2005-02-10' -+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 -@@ -53,7 +53,7 @@ version="\ - 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 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -106,7 +106,6 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi - : ${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" ; -@@ -203,15 +202,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 ;; -- luna88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -227,12 +226,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 ;; - sgi:OpenBSD:*:*) -- echo mips64-unknown-openbsd${UNAME_RELEASE} -+ echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ wgrisc:OpenBSD:*:*) -+ echo mipsel-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -245,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; -+ *:MicroBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} -+ exit 0 ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) -@@ -319,9 +330,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; -- *:z/VM:*:*) -- echo s390-ibm-zvmoe -- exit 0 ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; -@@ -342,10 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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* | DRS?6000:isis:4.2*:7*) -+ DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; -@@ -755,7 +760,7 @@ EOF - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - *:UNICOS/mp:*:*) -- echo craynv-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'` -@@ -778,7 +783,21 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ # Determine whether the default compiler uses glibc. -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #include <features.h> -+ #if __GLIBC__ >= 2 -+ LIBC=gnu -+ #else -+ LIBC= -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^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 -@@ -789,8 +808,8 @@ EOF - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -+ x86:Interix*:3*) -+ echo i586-pc-interix3 - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -@@ -804,9 +823,6 @@ EOF - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; -- amd64:CYGWIN*:*:*) -- echo x86_64-unknown-cygwin -- exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; -@@ -827,15 +843,6 @@ EOF - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -- cris:Linux:*:*) -- echo cris-axis-linux-gnu -- exit 0 ;; -- crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -- exit 0 ;; -- frv:Linux:*:*) -- echo frv-unknown-linux-gnu -- exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -@@ -917,9 +924,6 @@ EOF - 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 ;; -@@ -977,9 +981,6 @@ EOF - 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 -@@ -1082,9 +1083,9 @@ EOF - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; -- M68*:*:R3V[5678]*:*) -+ M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 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 | S7501*:*: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` -@@ -1182,10 +1183,9 @@ EOF - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) -- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -+ case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; -- unknown) UNAME_PROCESSOR=powerpc ;; -+ powerpc) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; -@@ -1200,9 +1200,6 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; -- NSE-?:NONSTOP_KERNEL:*:*) -- echo nse-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; -@@ -1250,16 +1247,6 @@ EOF - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; -- *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -- case "${UNAME_MACHINE}" in -- A*) echo alpha-dec-vms && exit 0 ;; -- I*) echo ia64-dec-vms && exit 0 ;; -- V*) echo vax-dec-vms && exit 0 ;; -- esac ;; -- *:XENIX:*:SysV) -- echo i386-pc-xenix -- exit 0 ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 diff -pruN dillo-0.8.6/config.h.in dillo-0.8.6-i18n-misc-20070916/config.h.in --- dillo-0.8.6/config.h.in 2006-04-27 01:06:37.000000000 +0900 +++ dillo-0.8.6-i18n-misc-20070916/config.h.in 2007-09-07 01:01:29.000000000 +0900 @@ -8951,274 +8705,6 @@ + +EOF diff -pruN dillo-0.8.6/config.sub dillo-0.8.6-i18n-misc-20070916/config.sub ---- dillo-0.8.6/config.sub 2005-03-22 16:17:05.000000000 +0900 -+++ dillo-0.8.6-i18n-misc-20070916/config.sub 2006-05-16 01:21:07.000000000 +0900 -@@ -1,9 +1,9 @@ - #! /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 Free Software Foundation, Inc. - --timestamp='2005-02-10' -+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 -@@ -70,7 +70,7 @@ Report bugs and patches to <config-patch - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -145,7 +145,7 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis) - os= - basic_machine=$1 - ;; -@@ -237,7 +237,7 @@ case $basic_machine in - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -+ | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -264,10 +264,10 @@ case $basic_machine in - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -300,7 +300,7 @@ case $basic_machine in - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | craynv-* | cydra-* \ -+ | clipper-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -@@ -310,7 +310,7 @@ case $basic_machine in - | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -326,9 +326,8 @@ case $basic_machine in - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -- | mmix-* \ - | msp430-* \ -- | none-* | np1-* | ns16k-* | ns32k-* \ -+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -@@ -343,8 +342,8 @@ case $basic_machine in - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -+ | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; -@@ -446,10 +445,6 @@ case $basic_machine in - basic_machine=j90-cray - os=-unicos - ;; -- craynv) -- basic_machine=craynv-cray -- os=-unicosmp -- ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf -@@ -457,9 +452,6 @@ case $basic_machine in - crds | unos) - basic_machine=m68k-crds - ;; -- crisv32 | crisv32-* | etraxfs*) -- basic_machine=crisv32-axis -- ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -@@ -489,10 +481,6 @@ case $basic_machine in - basic_machine=m88k-motorola - os=-sysv3 - ;; -- djgpp) -- basic_machine=i586-pc -- os=-msdosdjgpp -- ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -671,6 +659,10 @@ case $basic_machine in - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -+ mmix*) -+ basic_machine=mmix-knuth -+ os=-mmixware -+ ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -751,6 +743,10 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -+ nv1) -+ basic_machine=nv1-cray -+ os=-unicosmp -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -797,24 +793,18 @@ case $basic_machine in - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -+ pentiumii | pentium2) - 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-* | pentiumiii-* | pentium3-*) -+ pentiumii-* | pentium2-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentium4-*) -- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - pn) - basic_machine=pn-gould - ;; -@@ -873,10 +863,6 @@ case $basic_machine in - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -- sei) -- basic_machine=mips-sei -- os=-seiux -- ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -884,9 +870,6 @@ case $basic_machine in - basic_machine=sh-hitachi - os=-hms - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -961,6 +944,10 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -+ tic4x | c4x*) -+ basic_machine=tic4x-unknown -+ os=-coff -+ ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff -@@ -1033,10 +1020,6 @@ case $basic_machine in - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- xbox) -- basic_machine=i686-pc -- os=-mingw32 -- ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; -@@ -1067,9 +1050,6 @@ case $basic_machine in - romp) - basic_machine=romp-ibm - ;; -- mmix) -- basic_machine=mmix-knuth -- ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1202,9 +1182,6 @@ case $os in - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -- -linux-dietlibc) -- os=-linux-dietlibc -- ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1305,9 +1282,6 @@ case $os in - -kaos*) - os=-kaos - ;; -- -zvmoe) -- os=-zvmoe -- ;; - -none) - ;; - *) -@@ -1339,9 +1313,6 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1388,9 +1359,6 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -- os=-mmixware -- ;; - *-wec) - os=-proelf - ;; diff -pruN dillo-0.8.6/configure dillo-0.8.6-i18n-misc-20070916/configure --- dillo-0.8.6/configure 2006-04-27 01:06:45.000000000 +0900 +++ dillo-0.8.6-i18n-misc-20070916/configure 2007-09-07 01:00:43.000000000 +0900