--- fpc-2.4.0.orig/debian/fp-compiler.preinst.in +++ fpc-2.4.0/debian/fp-compiler.preinst.in @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +# Remove fpc from pc alternative if buggy 2.0.0-{1,2} versions are upgraded + +if [ "$1" = "upgrade" ] && [ "$2" = "2.0.0-1" ] || [ "$2" = "2.0.0-2" ]; then + update-alternatives --remove pc /usr/bin/fpc +fi + +# Debhelper code +#DEBHELPER# --- fpc-2.4.0.orig/debian/README.Debian.in +++ fpc-2.4.0/debian/README.Debian.in @@ -0,0 +1,47 @@ +The Free Pascal Compiler for Debian +----------------------------------- + +The source tree was checked out from the subversion repository at +svn.freepascal.org with + 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvnpath}' + +Only PDF docs are built as shipped. You may want to make the HTML files with +tex4ht by yourself and eventually adapt the doc-base file. + +To create a new config file for fpc (/etc/fpc.cfg) use the command: + /usr/lib/fpc/%{fpcversion}/samplecfg /usr/lib/fpc/%{fpcversion} +However, you should be aware that said file (/etc/fpc.cfg) is +declared as a conffile since version 1.0.2. + +And, yes - this is a i386/amd64/powerpc/sparc/arm only package currently. + + +Web site and download information: +---------------------------------- + +The Original site is + http://www.freepascal.org/ + ftp://ftp.freepascal.org/ + +HTTP Mirrored at + http://www.nl.freepascal.org/ + http://www.de.freepascal.org/ + http://www.freepascal.sk/ + http://gd.tuwien.ac.at/languages/pascal/fpc/www/ + http://www.atlasz.com/freepascal/ + +FTP Mirrored at + http://fpc.planetmirror.com/pub/fpc/ + ftp://gd.tuwien.ac.at/languages/pascal/fpc/ + ftp://ftp.hu.freepascal.org/pub/fpc/ + ftp://ftp.uni-erlangen.de/pub/mirrors/freepascal/ + http://mirror.mirimar.net/freepascal/ + http://cdn.mirror.garr.it/mirrors/freepascal/ + ftp://ftpsv1.u-aizu.ac.jp/pub/lang/pascal/freepascal/ + ftp://ftp.nl.freepascal.org/pub/fpc/ + ftp://freepascal.stack.nl/pub/fpc/ + ftp://ftp.no.freepascal.org/pub/fpc/ + ftp://ftp.chg.ru/pub/lang/pascal/fpc/ + ftp://ftp.us.freepascal.org/pub/fpc/ + + -- Varun Hiremath , Sat, 20 Jan 2007 01:28:28 +0530 --- fpc-2.4.0.orig/debian/fp-units-gnome1.install.in +++ fpc-2.4.0/debian/fp-units-gnome1.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-gnome1 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/imlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gnome1 --- fpc-2.4.0.orig/debian/compat +++ fpc-2.4.0/debian/compat @@ -0,0 +1 @@ +5 --- fpc-2.4.0.orig/debian/fp-compiler.install.in +++ fpc-2.4.0/debian/fp-compiler.install.in @@ -0,0 +1,16 @@ +/etc/fpc.cfg +/usr/bin/fpc +/usr/bin/fpcsubst +/usr/bin/fpcmkcfg +/usr/bin/grab_vcsa +/usr/lib/fpc/%{fpcversion}/ppc* +/usr/lib/fpc/%{fpcversion}/samplecfg +/usr/lib/fpc/%{fpcversion}/msg +/usr/share/doc/fp-compiler +/usr/share/man/man1/fpc.1 +/usr/share/man/man1/fpcsubst.1 +/usr/share/man/man1/fpcmkcfg.1 +/usr/share/man/man1/ppc*.1 +/usr/share/man/man1/grab_vcsa.1 +/usr/share/man/man5/fpc.cfg.5 +/usr/bin/fpc-depends --- fpc-2.4.0.orig/debian/fp-units-base.install.in +++ fpc-2.4.0/debian/fp-units-base.install.in @@ -0,0 +1,10 @@ +/usr/share/doc/fp-units-base + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fpmkunit +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/paszlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pasjpeg +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ncurses +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/x11 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/regexpr +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/hash +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/uuid --- fpc-2.4.0.orig/debian/moveexamples +++ fpc-2.4.0/debian/moveexamples @@ -0,0 +1,52 @@ +#!/bin/bash + +set -e + +EXAMPLE_TEMP=$1 +DOC_DIR=$2 + +function move_examples() +{ + # Make examples dir + install -d -m 755 $DOC_DIR/fp-units-$1/examples/ + + for package in $2 + do + if [ -d $EXAMPLE_TEMP/$package/examples ]; then + echo "Moving examples of $package" + EXAMPLE_TEMP_DIR="$EXAMPLE_TEMP/$package/examples" + EXAMPLE_INSTALL_DIR="$DOC_DIR/fp-units-$1/examples/$package" + # Move dir renaming it + if [ -e "${EXAMPLE_INSTALL_DIR}" ] + then + echo "#### \"${EXAMPLE_INSTALL_DIR}\" is in the way, please remove it first ####" + exit 255 + else + mv -v -f "${EXAMPLE_TEMP_DIR}" "${EXAMPLE_INSTALL_DIR}" + rmdir $EXAMPLE_TEMP/$package + # Remove empty directories: + rmdir --ignore-fail-on-non-empty "${EXAMPLE_INSTALL_DIR}" + fi + fi + done + + # Remove empty directories: + rmdir --ignore-fail-on-non-empty $DOC_DIR/fp-units-$1/examples +} + +echo '**** Copying examples ****' +PACKAGE_LIST='debian/fp-units-'*'.install.in' + +for PACKAGE_FILE in ${PACKAGE_LIST} +do + PACKAGE_NAME=`basename "${PACKAGE_FILE}" '.install.in' | sed -e 's/fp-units-//'` + PACKAGE_CONTENT=`grep '/usr/lib/fpc' "${PACKAGE_FILE}" | sed -e 's@.*/\([^/]\)/\?@\1@'` + echo ' **** PACKAGE_NAME = "'${PACKAGE_NAME}'"' + echo ' **** PACKAGE_CONTENT = "'${PACKAGE_CONTENT}'"' + move_examples "${PACKAGE_NAME}" "${PACKAGE_CONTENT}" +done + +echo '**** Examples copyed ****' + +rmdir $EXAMPLE_TEMP + --- fpc-2.4.0.orig/debian/fixdeb +++ fpc-2.4.0/debian/fixdeb @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Create debian files from *.in files +# +# $1 = path to debian files +# $2 = fpc target (i386-linux) +# $3 = ppcXXX binary name (ppc386) +# +if [ $# != 3 ]; then + echo 'Usage : fixdeb path fpctarget ppcbin' + exit 1 +fi + +PACKAGEVERSION=`dpkg-parsechangelog | sed -ne's,^Version: \(.*\),\1,p'` +FPCVERSION=`echo $PACKAGEVERSION | sed -ne's,^\([0-9.]*\).*,\1,p'` +DEBVERSION=`echo $PACKAGEVERSION | awk -F '-' '{ print $NF }'` +FPCSVNPATH=`echo $FPCVERSION | awk -F '.' '{ print "release_"$1"_"$2"_"$3 }'` +FPCTARGET="$2" +PPCBIN="$3" + +echo 'PackageVersion: ' $PACKAGEVERSION +echo 'FPCVersion : ' $FPCVERSION +echo 'FPCTarget : ' $FPCTARGET +echo 'DebVersion : ' $DEBVERSION +echo 'PPCBin : ' $PPCBIN +echo 'SVNPath : ' $FPCSVNPATH + +for i in $1/*.in +do + j=$1/$(basename $i .in) + sed -e 's/%{fpcversion}/'$FPCVERSION'/g;s/%{packageversion}/'$PACKAGEVERSION'/g;s/%{ppcbin}/'$PPCBIN'/g;s/%{fpctarget}/'$FPCTARGET'/g;s/%{fpcsvnpath}/'$FPCSVNPATH'/g' $i > $j +done --- fpc-2.4.0.orig/debian/copyright.in +++ fpc-2.4.0/debian/copyright.in @@ -0,0 +1,71 @@ +The packages were originally put together by: + Peter Vreman + +Debian maintainer: + Carlos Laviola + +With sources obtained from: + 'svn co http://svn.freepascal.org/svn/fpcbuild/tags/%{fpcsvnpath}' + +The files and libraries are released under the terms of the GNU Library +General Public License, which can be found in the file +/usr/share/common-licenses/GPL-2 on a Debian system. + +- object files and libraries linked into an application may be + distributed without source code. + +---------- + +djgpp: + +Copyright (C) DJ Delorie + 24 Kirsten Ave + Rochester NH 03867-2954 + + Source code copyright DJ Delorie is distributed under the terms of the + GNU General Public Licence, with the following exceptions: + + * Any existing copyright or authorship information in any given source + file must remain intact. If you modify a source file, a notice to that + effect must be added to the authorship information in the source file. + + * binaries provided in djgpp may be distributed without sources ONLY if + the recipient is given sufficient information to obtain a copy of djgpp + themselves. This primarily applies to go32.exe, emu387, stub.exe, and + the graphics drivers. + + * modified versions of the binaries provided in djgpp must be + distributed under the terms of the GPL. + + * objects and libraries linked into an application may be distributed + without sources. + +---------- + +emx: + + emx 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. + +---------- + +rsx: + +Copyright (C) 1993-1998 Rainer Schnither + email to rainer@mathematik.uni-bielefeld.de + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + --- fpc-2.4.0.orig/debian/watch +++ fpc-2.4.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/freepascal/ fpcbuild-(.*).tar.gz debian debian/orig-tar.sh --- fpc-2.4.0.orig/debian/fp-units-misc.install.in +++ fpc-2.4.0/debian/fp-units-misc.install.in @@ -0,0 +1,18 @@ +/usr/share/doc/fp-units-misc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/chm +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fppkg +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/iconvenc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libxml2 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/utmp +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pthreads +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/zlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/tcl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/cdrom +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/bfd +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/syslog +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbint +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unzip +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/newt +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fftw +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/aspell +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/users --- fpc-2.4.0.orig/debian/fp-units-multimedia.install.in +++ fpc-2.4.0/debian/fp-units-multimedia.install.in @@ -0,0 +1,8 @@ +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/a52 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/dts +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/mad +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/modplug +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/oggvorbis +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/openal +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/sdl +/usr/share/doc/fp-units-multimedia --- fpc-2.4.0.orig/debian/orig-tar.sh +++ fpc-2.4.0/debian/orig-tar.sh @@ -0,0 +1,17 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' +TAR=$3 +DIR=fpcbuild-$2 + +# clean up the upstream tarball +tar -x -z -f $TAR +tar -c -z -f $TAR --exclude '*.dll' --exclude '*.exe' --exclude '*.log' --exclude '*.o' $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi --- fpc-2.4.0.orig/debian/fp-docs.doc-base.in +++ fpc-2.4.0/debian/fp-docs.doc-base.in @@ -0,0 +1,10 @@ +Document: fpc-docs +Title: Free Pascal Documentation +Author: Michael van Canneyt +Abstract: Documentation for the Free Pascal Compiler. + . +Section: Programming + +Format: html +Files: /usr/share/doc/fp-docs/* +Index: /usr/share/doc/fp-docs/%{fpcversion}/fpctoc.html --- fpc-2.4.0.orig/debian/fpc-source.install.in +++ fpc-2.4.0/debian/fpc-source.install.in @@ -0,0 +1,3 @@ +/usr/share/fpcsrc/%{fpcversion}/compiler +/usr/share/fpcsrc/%{fpcversion}/packages +/usr/share/fpcsrc/%{fpcversion}/rtl --- fpc-2.4.0.orig/debian/README.source +++ fpc-2.4.0/debian/README.source @@ -0,0 +1,11 @@ +Debian specific changes to FPC sources. +------------------------------------------- + +This version of FPC was modified by Debian maintainer. All modifications +are avaialble in debian/patches directory. + +For more information about Debian change policy, please refer to +/usr/share/doc/quilt/README.source. + + -- Abou Al Montacir Fri, 27 Oct 2009 08:59:30 +0200 + --- fpc-2.4.0.orig/debian/fpc-depends.in +++ fpc-2.4.0/debian/fpc-depends.in @@ -0,0 +1,65 @@ +#!/usr/bin/perl + +# Copyright (c) 2005 Rafael Laboissiere +# +# This program 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 of the License, or +# (at your option) any later version. +# +# This program 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. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +=head1 NAME + +fpc-depends - calculates free pascal dependencies + +=cut + +use strict; +use warnings; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +fpc-depends is a debhelper-like program that is responsible for +generating the ${fpc-abi:Depends} substitutions and adding them to +substvars files. + +If you use this program, your package must build-depend on fp-compiler +(>= 2.2.0-3). + + +=cut + +init (); + +foreach my $package (@{$dh{DOPACKAGES}}) { + delsubstvar($package, "fpc-abi:Depends"); + addsubstvar($package, "fpc-abi:Depends", "fpc-abi-%{fpcversion}"); +} + +=head1 SEE ALSO + +L + +This program is not part of debhelper. + +=head1 AUTHOR + +Torsten Werner + +Most ideas borrowed from octave-depends by Rafael Laboissiere +. + +=cut --- fpc-2.4.0.orig/debian/rules +++ fpc-2.4.0/debian/rules @@ -0,0 +1,308 @@ +#!/usr/bin/make -f +# debian/rules for Free Pascal + +DEB_DH_BUILDDEB_ARGS := -- -Z bzip2 +export DH_ALWAYS_EXCLUDE := COPYING:LICENSE +export LANG:=C + +# Documentation type to use pdf/html +ifeq (${DEBDOCTYPE},) +DOCTYPE=html +# HTML Converter l2h/4ht/hevea or html for (default) +CONVERTER=hevea +else +DOCTYPE=${DEBDOCTYPE} +CONVERTER=${DOCTYPE} +endif + +# Detect name of new compiler, take care that debian uses amd64 instead of x86_64 +CPU_SOURCE := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_BUILD_ARCH)) +CPU_TARGET := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_HOST_ARCH)) + +# Fixup armel, too +CPU_SOURCE := $(subst armel,arm,$(CPU_SOURCE)) +CPU_TARGET := $(subst armel,arm,$(CPU_TARGET)) + +ifeq ($(CPU_TARGET),m68k) +PPSUF=68k +endif +ifeq ($(CPU_TARGET),i386) +PPSUF=386 +endif +ifeq ($(CPU_TARGET),x86_64) +PPSUF=x64 +endif +ifeq ($(CPU_TARGET),powerpc) +PPSUF=ppc +endif +ifeq ($(CPU_TARGET),alpha) +PPSUF=axp +endif +ifeq ($(CPU_TARGET),arm) +PPSUF=arm +endif +ifeq ($(CPU_TARGET),sparc) +PPSUF=sparc +endif + +ifneq ($(CPU_SOURCE),$(CPU_TARGET)) +PPPRE=ppcross +else +PPPRE=ppc +endif + +PPNEW=$(PPPRE)$(PPSUF) + +FPCTARGET=$(CPU_TARGET)-linux + +# Reset FPC and FPCDIR if it was set +FPC= +FPCDIR= +# Get version information from changelog file +DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | cut -f 1 -d -) +DEB_UPSTREAM_MAIN_VERSION:=$(shell echo ${DEB_UPSTREAM_VERSION} | sed -e 's/^\([0-9\.]*\).*/\1/') +# Get directories +CURDIR:=$(shell pwd) +BUILD_DIR=$(CURDIR)/debian/build +INSTALL_DIR=$(CURDIR)/debian/tmp +DOC_DIR=${INSTALL_DIR}/usr/share/doc +SRC_DIR=$(INSTALL_DIR)/usr/share/fpcsrc/${DEB_UPSTREAM_MAIN_VERSION} +EXAMPLE_TEMP=${INSTALL_DIR}/usr/share/doc/fpc-${DEB_UPSTREAM_MAIN_VERSION} +# Get utils +ifndef MKDIR +MKDIR=mkdir -p +endif +ifndef CP +CP=cp -Rfpl +endif +RM:=rm -rf +# Get fpcmake from path if none is specified. +ifndef FPCMAKE +FPCMAKE=fpcmake +endif +NEWPP=$(CURDIR)/fpcsrc/compiler/$(PPNEW) +NEWFPDOC=$(CURDIR)/fpcsrc/utils/fpdoc/fpdoc +#If not cross compiling, then use new generated fpcmake utility. +ifeq (${PPPRE},) +NEWFPCMAKE=$(CURDIR)/fpcsrc/utils/fpcm/fpcmake +else +NEWFPCMAKE=${FPCMAKE} +endif +# Set default compilation options +BUILDOPTS=PP=$(NEWPP) +ifdef CROSSOPT +BUILDOPTS+= CROSSOPT=${CROSSOPT} +endif +INSTALLOPTS=INSTALL_PREFIX=$(INSTALL_DIR)/usr PP=$(NEWPP) FPCMAKE=$(NEWFPCMAKE) + +export GDBLIBDIR=/usr/lib + +# Configure patch system +include /usr/share/quilt/quilt.make + +#export DH_VERBOSE=1 + +################### +# Clean +# + +clean: patch configure clean-patched unpatch + ${RM} build-arch-stamp install-arch-stamp arrange-arch-stamp configure-stamp + ${RM} build-doc-stamp install-doc-stamp + ${RM} build-indep-stamp install-indep-stamp + ${RM} debian-files-stamp + ${RM} debian/files debian/docs debian/dirs debian/*.files debian/*.docs debian/*.examples debian/*.postinst debian/*.postrm + ${RM} .pc + ${RM} debian/fpc-depends.1 + # Remove auto-generated version file. + ${RM} fpcsrc/compiler/version.inc + # Remove auto-generated make files. + find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';' + dh_clean +clean-patched: + @echo "--- Cleaning" + dh_testdir + dh_testroot + $(MAKE) -C fpcsrc compiler_distclean + $(MAKE) -C fpcsrc rtl_distclean + $(MAKE) -C fpcsrc packages_distclean + $(MAKE) -C fpcsrc ide_distclean + $(MAKE) -C fpcsrc utils_distclean + $(MAKE) -C fpcdocs clean + find '(' -name '*.a' -or -name '*.o' -or -name '*.so' -or -name '*.ppu' ')' -exec ${RM} '{}' ';' + dh_prep + +################### +# Debian files +# + +debian-files: patch debian-files-stamp +debian-files-stamp: + @echo "--- Creating/fixing *.install files" + /bin/bash debian/fixdeb debian $(FPCTARGET) $(PPNEW) + touch debian-files-stamp + +################### +# Arch packages +# + +configure: configure-stamp +configure-stamp: + dh_testdir + # Remove auto-generated make files. + find -name Makefile.fpc -execdir 'sh' '-c' '${RM} $$(basename {} .fpc)' ';' + # Regenrate make files using fpcmake. + ${FPCMAKE} -r -Tall */Makefile.fpc + # Remove auto-generated version file. + ${RM} fpcsrc/compiler/version.inc + # Add version.inc: + echo \'$(DEB_VERSION)\' > fpcsrc/compiler/version.inc + touch configure-stamp + +build-arch: debian-files configure build-arch-stamp +build-arch-stamp: + @echo "--- Building" + dh_testdir +# First make a new Compiler and RTL using a make cycle + $(MAKE) -C fpcsrc compiler_cycle + $(MAKE) -C fpcsrc rtl_clean rtl_smart $(BUILDOPTS) + $(MAKE) -C fpcsrc packages_smart $(BUILDOPTS) + $(MAKE) -C fpcsrc ide_all $(BUILDOPTS) + $(MAKE) -C fpcsrc utils_all $(BUILDOPTS) + touch build-arch-stamp + +install-arch: build-arch install-arch-stamp +install-arch-stamp: + @echo "--- Installing" + dh_testdir + dh_testroot +# Specify the compiler to use so installing will use the correct versioned dir + $(MAKE) -C fpcsrc compiler_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc rtl_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc packages_distinstall $(INSTALLOPTS) + $(MAKE) -C fpcsrc ide_distinstall $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-ide + $(MAKE) -C fpcsrc utils_distinstall $(INSTALLOPTS) +# Copy examples to the correct doc dir + /bin/bash debian/moveexamples $(EXAMPLE_TEMP) $(DOC_DIR) +# Install man pages + $(MAKE) -C install/man installman $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share +# Install RTL demos + $(MAKE) -C demo sourceinstall $(INSTALLOPTS) INSTALL_SOURCEDIR=$(DOC_DIR)/fp-compiler +# Install whatsnew and readme + $(MAKE) -C install/doc installdoc $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler +# Create fpc.cfg which is included as conffile + /bin/bash fpcsrc/compiler/utils/samplecfg \ + /usr/lib/fpc/${DEB_UPSTREAM_VERSION} ${INSTALL_DIR}/etc + install -D debian/fpc-depends debian/tmp/usr/bin/ + set -x; cd debian/overrides ; for PACKAGE in * ; do \ + install -m644 -D $$PACKAGE \ + ../$$PACKAGE/usr/share/lintian/overrides/$$PACKAGE ; \ + done + touch install-arch-stamp + +arrange-arch: install-arch arrange-arch-stamp +arrange-arch-stamp: + dh_testdir + dh_testroot + dh_install -s --sourcedir=debian/tmp --list-missing + touch arrange-arch-stamp + +build-indep: patch +install-indep: + touch install-indep-stamp + +################### +# Documentation +# + +build-doc: patch debian-files build-doc-stamp +build-doc-stamp: + @echo "--- Building Documentation" + dh_testdir + ${MKDIR} fpcsrc/compiler/utils/units/${FPCTARGET} + $(MAKE) -C fpcdocs $(CONVERTER) + touch build-doc-stamp + +install-doc: build-doc install-doc-stamp +install-doc-stamp: + @echo "--- Installing Documentation" + dh_testdir + dh_testroot + ${MAKE} -C fpcdocs ${DOCTYPE}install INSTALL_PREFIX=${INSTALL_DIR}/usr INSTALL_DOCDIR=${DOC_DIR}/fp-docs/${DEB_UPSTREAM_MAIN_VERSION} + touch install-doc-stamp + +################### +# Source +# + +install-source: install-source-stamp +install-source-stamp: + @echo "--- Cleaning the tree and copying the source code" + dh_testdir + dh_testroot + ${MKDIR} ${SRC_DIR} + ${CP} -t ${SRC_DIR} \ + $(CURDIR)/fpcsrc/compiler \ + $(CURDIR)/fpcsrc/packages \ + $(CURDIR)/fpcsrc/rtl + touch install-source-stamp + +################### +# Generic +# + +build: build-arch build-indep +install: install-arch install-indep +binary: binary-arch binary-indep + + +################### +# Deb building +# + +binary-indep: clean-patched build-doc install-doc install-source debian-files + @echo "--- Building: arch-indep packages" + dh_testdir + dh_testroot + dh_installdocs -i -X.in + dh_installchangelogs -i + dh_install -i --sourcedir=debian/tmp --list-missing + find debian/fpc-source/usr/share/fpcsrc/ -type f \ + -not -regex '.*\.\(fpc\|inc\|pas\|pp\)' -delete + find debian/fpc-source/usr/share/fpcsrc/ -type d \ + -empty -delete + dh_compress -i -X.pdf + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) + +binary-arch: arrange-arch + @echo "--- Building: arch packages" + dh_testdir + dh_testroot + dh_link + dh_installdocs -a + dh_installchangelogs -a + dh_installexamples -a + pod2man -c 'Free pascal for Debian GNU/Linux' \ + debian/fpc-depends > debian/fpc-depends.1 + dh_installman -s + dh_strip -s + dh_compress -a + dh_fixperms -a + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s $(DEB_DH_BUILDDEB_ARGS) + +.PHONY: build clean binary binary-arch \ + binary-indep debian-files build-arch \ + install install-indep install-arch \ + configure + +get-orig-source: + -uscan --upstream-version=0 --rename --- fpc-2.4.0.orig/debian/fp-units-rtl.install.in +++ fpc-2.4.0/debian/fp-units-rtl.install.in @@ -0,0 +1 @@ +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/rtl --- fpc-2.4.0.orig/debian/fp-compiler.doc-base.in +++ fpc-2.4.0/debian/fp-compiler.doc-base.in @@ -0,0 +1,10 @@ +Document: fpc-compiler +Title: Free Pascal FAQ +Author: Michael van Canneyt +Abstract: Frequnetly Asked Questions about the Free Pascal Compiler. + . +Section: Programming + +Format: html +Files: /usr/share/doc/fp-compiler/* +Index: /usr/share/doc/fp-compiler/faq.html --- fpc-2.4.0.orig/debian/fp-compiler.prerm.in +++ fpc-2.4.0/debian/fp-compiler.prerm.in @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +# remove alternative +update-alternatives --remove pc /usr/bin/fpc + +# Debhelper code +#DEBHELPER# --- fpc-2.4.0.orig/debian/fp-units-gfx.install.in +++ fpc-2.4.0/debian/fp-units-gfx.install.in @@ -0,0 +1,13 @@ +/usr/bin/fd2pascal +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/opengl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/xforms +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/svgalib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ggi +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/imagemagick +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libgd +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libpng +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/graph +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/cairo +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/rsvg +/usr/share/doc/fp-units-gfx +/usr/share/man/man1/fd2pascal.1 --- fpc-2.4.0.orig/debian/fp-ide.install.in +++ fpc-2.4.0/debian/fp-ide.install.in @@ -0,0 +1,5 @@ +/usr/bin/fp +/usr/lib/fpc/%{fpcversion}/ide +/usr/share/doc/fp-ide +/usr/share/man/man1/fp.1 + --- fpc-2.4.0.orig/debian/fp-units-math.install.in +++ fpc-2.4.0/debian/fp-units-math.install.in @@ -0,0 +1,4 @@ +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gmp +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/numlib +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/proj4 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/symbolic --- fpc-2.4.0.orig/debian/fp-units-gtk2.install.in +++ fpc-2.4.0/debian/fp-units-gtk2.install.in @@ -0,0 +1,3 @@ +/usr/share/doc/fp-units-gtk2 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gtk2 --- fpc-2.4.0.orig/debian/fp-units-db.install.in +++ fpc-2.4.0/debian/fp-units-db.install.in @@ -0,0 +1,10 @@ +/usr/share/doc/fp-units-db + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/mysql +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ibase +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/postgres +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/oracle +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/odbc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gdbm +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/sqlite +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pxlib --- fpc-2.4.0.orig/debian/control +++ fpc-2.4.0/debian/control @@ -0,0 +1,356 @@ +Source: fpc +Section: devel +Priority: optional +Maintainer: Carlos Laviola +Uploaders: Torsten Werner , Abou Al Montacir +DM-Upload-Allowed: yes +Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7), quilt, fp-compiler (>= 2.2.4-5), fp-units-base, + fp-units-fcl, fp-utils, mawk | awk, gs-common, libncurses-dev, binutils +Build-Depends-Indep: hevea +Vcs-Svn: https://bollin.googlecode.com/svn/fpc/trunk/ +Vcs-Browser: http://bollin.googlecode.com/svn/fpc/trunk/ +Homepage: http://www.freepascal.org/ + +Package: fpc +Architecture: all +Depends: ${misc:Depends}, fp-units-rtl, fp-compiler, fp-units-base, fp-ide, fp-units-fcl, fp-units-fv, fp-units-gtk, fp-units-gtk2, fp-units-gnome1, fp-units-db, fp-units-gfx, fp-units-net, fp-units-misc, fp-units-multimedia, fp-units-math +Recommends: fp-utils +Suggests: lazarus, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal Compiler - Meta Package + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains dependency on all FPC packages provided on your + architecture. Experienced users may want to install only packages they need, + and can skip installing this metapackage. + +Package: fpc-source +Architecture: all +Depends: ${misc:Depends} +Description: Free Pascal Compiler - Source Code + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal's own source code. It is meant to be used by + the Lazarus IDE. + +Package: fp-compiler +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Suggests: fp-utils, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal - Compiler + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains the command line compiler. + +Package: fp-ide +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), ${shlibs:Depends} +Suggests: fp-utils, fp-docs (>= ${source:Upstream-Version}) +Description: Free Pascal - IDE + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + Some extensions are added to the language, like function overloading. Shared + libraries can be linked and created. Delphi language extentions like classes, + exceptions, ansi strings and open arrays are also supported. + . + This package contains the Integrated Development Environment (IDE). The IDE + has an internal compiler. + +Package: fp-utils +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends} +Recommends: fp-compiler (= ${binary:Version}) +Description: Free Pascal - Utils + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains some handy utils for usage with the Free Pascal + Compiler: + - ppumove Place multiple units in a shared library + - ppufiles Show needed files for units + - ppudump Dump the information stored in a .ppu (unit) file + - fpcmake Create Makefile from Makefile.fpc + - h2pas Convert .h files to pascal units + - ppdep Create a dependency file which can be used with Makefiles + - ptop Source beautifier + - data2inc Convert binary/text data to include files + - plex/pyacc Pascal Lex/Yacc implementation + +Package: fp-docs +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Free Pascal - Documentation + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package provides documentation for the Free Pascal Compiler in HTML + format. + +Package: fp-units-rtl +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends} +Recommends: fp-compiler (= ${binary:Version}) +Provides: fpc-abi-${source:Upstream-Version} +Description: Free Pascal - Runtime Library + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Runtime Libraries for the Free Pascal Compiler. + +Package: fp-units-base +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - base units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units for common libraries. Some of these + units are also required by the Free Component Library: + - X11 (Xlib, Xutil) + - NCurses + - ZLib + +Package: fp-units-fcl +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), fp-units-base (= ${binary:Version}) +Description: Free Pascal - Free Component Library + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Free Component Library for the Free Pascal Compiler. + +Package: fp-units-fv +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - Free Vision units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains the Free Vision units for the Free Pascal Compiler. + +Package: fp-units-gtk +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), fp-units-fcl (= ${binary:Version}), libgtk2.0-dev +Description: Free Pascal - GTK+ 1.2 units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs with GTK+ 1.2. + +Package: fp-units-gtk2 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), fp-units-fcl (= ${binary:Version}) +Description: Free Pascal - GTK+ 2.x units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs with GTK+ 2.x. + +Package: fp-units-gnome1 +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), fp-units-gtk (= ${binary:Version}) +Description: Free Pascal - GNOME 1 units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units and examples to create + programs for GNOME 1. + +Package: fp-units-db +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - database libraries units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units with bindings for: + - MySQL + - Interbase + - PostgreSQL + - Oracle + - ODBC + - GDBM + - SQLite + +Package: fp-units-gfx +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), fp-units-base (= ${binary:Version}) +Description: Free Pascal - graphics libraries units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units with bindings for: + - opengl :OpenGL + - forms : Forms 0.88 + - svgalib : Svgalib + - ggi : General Graphical Interface + - libgd + - libpng + - graph + - openal + - cairo + +Package: fp-units-net +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - networking units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal units for creating network tools: + - netdb : NetDB unit for TCP/IP handling + - libasync : LibAsync unit for easy Asynchronous IO + - libcurl + - dbus: D-Bus + - httpd-1.3 + - httpd-2.0 + - httpd-2.2 + - ldap + - openssl : Open SSL + - pcap + +Package: fp-units-math +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Replaces: fp-units-misc (<= 2.2.4-4) +Description: Free Pascal - math units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal math interfacing units for: + - gmp : Interface for the GNU Multiple Precision Arithmetic Library + - proj4 : Compute projections + - numlib : numerical computing + - symbolic : symbolic computing + +Package: fp-units-misc +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - miscellaneous units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal miscellaneous units for: + - fppkg : support of FPC packaging system + - Utmp + - PasZLib (Pascal-only zlib implementation) + +Package: fp-units-multimedia +Architecture: i386 powerpc sparc amd64 armel +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}), libogg-dev, libvorbis-dev, a52dec-dev, libdts-dev, libmad0-dev, libmodplug-dev +Replaces: fp-units-gfx (<= 2.2.4-3) +Description: Free Pascal - multimedia units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal multimedia interfacing units for: + - oggvorbis + - a52 + - dts + - mad + - modplug + +Package: fp-units-i386 +Architecture: i386 +Depends: ${misc:Depends}, fp-units-rtl (= ${binary:Version}) +Description: Free Pascal - kylix compatibility units + The Free Pascal Compiler is an object pascal compiler supporting both Delphi + and Turbo Pascal 7.0 dialects as well as Mac pascal dialects. + It provides a completely portable RunTime Library (RTL) available on many + platforms and compatible with Turbo Pascal, but also a platfrom independent + class based Free Component Library (FCL) adding many Delphi extensions and + interfacing many popular open source libraries. + . + This package contains Free Pascal specific units for the i386 architecture: + - libc: used for compatibility with kylix, deprecated. --- fpc-2.4.0.orig/debian/fp-compiler.manpages +++ fpc-2.4.0/debian/fp-compiler.manpages @@ -0,0 +1 @@ +debian/fpc-depends.1 --- fpc-2.4.0.orig/debian/fp-utils.install.in +++ fpc-2.4.0/debian/fp-utils.install.in @@ -0,0 +1,57 @@ +/usr/bin/chmcmd +/usr/bin/chmls +/usr/bin/fppkg +/usr/bin/ppufiles +/usr/bin/ppudump +/usr/bin/ppumove +/usr/bin/ppdep +/usr/bin/ptop +/usr/bin/rstconv +/usr/bin/data2inc +/usr/bin/bin2obj +/usr/bin/delp +/usr/bin/plex +/usr/bin/pyacc +/usr/bin/h2pas +/usr/bin/h2paspp +/usr/bin/postw32 +/usr/bin/fpclasschart +/usr/bin/fpcmake +/usr/bin/fpcres +/usr/bin/fprcp +/usr/bin/fpdoc +/usr/bin/makeskel +/usr/bin/unitdiff +/usr/bin/mkxmlrpc +/usr/bin/rmcvsdir +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/lexyacc +/usr/lib/fpc/lexyacc/yylex.cod +/usr/lib/fpc/lexyacc/yyparse.cod +/usr/share/man/man1/chmcmd.1 +/usr/share/man/man1/chmls.1 +/usr/share/man/man1/fppkg.1 +/usr/share/man/man1/bin2obj.1 +/usr/share/man/man1/data2inc.1 +/usr/share/man/man1/fprcp.1 +/usr/share/man/man1/h2paspp.1 +/usr/share/man/man1/makeskel.1 +/usr/share/man/man1/mkxmlrpc.1 +/usr/share/man/man1/postw32.1 +/usr/share/man/man1/rmcvsdir.1 +/usr/share/man/man1/unitdiff.1 +/usr/share/man/man1/delp.1 +/usr/share/man/man1/fpcmake.1 +/usr/share/man/man1/fpcres.1 +/usr/share/man/man1/h2pas.1 +/usr/share/man/man1/plex.1 +/usr/share/man/man1/ppdep.1 +/usr/share/man/man1/ppudump.1 +/usr/share/man/man1/ppufiles.1 +/usr/share/man/man1/ppumove.1 +/usr/share/man/man1/ptop.1 +/usr/share/man/man1/pyacc.1 +/usr/share/man/man1/rstconv.1 +/usr/share/man/man1/fpdoc.1 +/usr/share/man/man1/fpclasschart.1 +/usr/share/man/man5/fpcmake.5 +/usr/share/man/man5/ptop.cfg.5 --- fpc-2.4.0.orig/debian/fp-units-net.install.in +++ fpc-2.4.0/debian/fp-units-net.install.in @@ -0,0 +1,11 @@ +/usr/share/doc/fp-units-net + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libcurl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/dbus +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fastcgi +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd13 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd20 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/httpd22 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/ldap +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/openssl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/pcap --- fpc-2.4.0.orig/debian/changelog +++ fpc-2.4.0/debian/changelog @@ -0,0 +1,668 @@ +fpc (2.4.0-2) unstable; urgency=low + + [ Abou Al Montacir ] + * Fixed build dependencies on fp-compiler (>= 2.2.4-5). (Closes:Bug#570591) + * Added dependency on ${misc:Depends} as required for packages using + debhelper. + * Removed pre-dependency on dpkg (>= 1.10.24). + * Fixed spell errors removing lintian warning. + * Fixed dependencies of fp-units-math package. (Closes:Bug#567574) + * Bumped standard version to 3.8.4. + * Updated lintian override files. + [ Stefan Kisdaroczi ] + * Fixed Pred and Succ functions. (Closes: Bug#569023) + + -- Abou Al Montacir Mon, 03 Feb 2010 22:48:00 +0100 + +fpc (2.4.0-1) unstable; urgency=low + + * New upstream release with many fixes and new features offering a nice + collection of new functionality and bug fixes. + * New platforms: + - Mac OS X/PowerPC64 + - Mac OS X/x86_64 + - Mac OS X/ARM (iPhone) + * Compiler changes: + - Support for Delphi-style resource handling + - Whole-program optimization infrastructure, which initially supports + program devirtualization and unused virtual method removal + - Much faster compilation of units containing many type-sections + - The ability to suppress individual hints/warnings/notes + - Several improvements to the DWARF debug information generation + - Fixes to the generics support + - Fixes to the interface delegation (implements) support + - Improved cpu register allocation + - Improved ARM/EABI support + * RTL changes: + - Linearly scaling multi-threaded memory manager + - Support for (advisory) file locking on Unix-based platforms + - when using the SysUtils file creation/opening routines + - Support for ANSI ISO Extended Pascal ReadStr/WriteStr + - A UnicodeString type that, while not yet equivalent to Delphi 2009's + UnicodeString type, offers reference counted UnicodeString support on + the Windows, Linux, Mac OS X, FreeBSD and Beos/Haiku platforms. + * Packages changes: + - Many improvements to the XML units + - Many improvements to the database units + - Updated the common Mac OS X Pascal interfaces to r241, including + header a translation of the CFNetwork framework + - The zipper unit now works correctly on big endian platforms + * Added a patch fixing building documentation on Debian systems. + * Included quilt.make in rules file. (Closes: Bug#538552) + * Packaged news utility program (fpclasschart) poducing a class tree from + source files. + * Removed duplicate section field. + * Fixed fp-units-i386 package short description. + * Removed unneeded override rule. + * Added doc-base file for fp-compiler package. + * Fixed lintian warnings related to spell errors. + * Fixed upgrade breakage from 2.2.4-3 caused by moving files from fp-units-gfx + to fp-units-multimedia. (Closes: Bug#565167) + + -- Abou Al Montacir Sun, 13 Dec 2009 22:25:00 +0100 + +fpc (2.2.4-5) unstable; urgency=low + + * Added a new package fp-units-math for math development support. + + -- Abou Al Montacir Sun, 04 Dec 2009 21:11:00 +0100 + +fpc (2.2.4-4) unstable; urgency=low + + * Added support of armel arch to fpcmake from upstream. + * Adde documentation index file. (fixes linitan warning) + * Bumped standard version to 3.8.3. + * Added README.source. (fixes linitian warning) + * Added support for automatic cross-platform deb packaging. + * Updated fcl-xml from upstream to allow building next upstream release doc. + * Bumped fpc-abi to take in account new fcl-xml interface changes. + * Removed build dependency on libreadline5-dev as no more required. + + -- Abou Al Montacir Sun, 30 Nov 2009 19:03:00 +0100 + +fpc (2.2.4-3) unstable; urgency=low + + [ Abou Al Montacir ] + * Fixed compilation error on power PC. + + -- Abou Al Montacir Wed, 03 Jun 2009 12:44:00 +0200 + +fpc (2.2.4-2) unstable; urgency=low + + [ Stefan Kisdaroczi ] + * Fixed FindFirst and FindGetFileInfo functions. (Closes: Bug#528681) + + [ Abou Al Montacir ] + * Added lintian override rules for embedded-zlib + * Fixed wrong passing of function parameters for powerpc architecture. + (Closes: Bug#515035, Bug#511626) + + -- Abou Al Montacir Sat, 30 May 2009 17:46:00 +0200 + +fpc (2.2.4-1) unstable; urgency=low + + [ Abou Al Montacir ] + * new upstream release + - Added support for TIFF reading/writing in fcl-image + - Improvements and fixes in CHM support + - Fixed linking the gtk2-package with gtk versions above 2.13.4 + - Added support for CHM help files + * Remove patches that are now obsolete. + * Removed dependency from GTK1 as it was removed from Squeeze. + [ Paul Gevers ] + * Fixed typo in sysconst.pp. (Closes: Bug#519013) + + -- Abou Al Montacir Sat, 02 May 2009 16:40:30 +0200 + +fpc (2.2.2-8) unstable; urgency=low + + * Removed .pc directory in clean target to avoid a lintian warning. + * Moved chmcmd and chmls tools to fp-utils and added man files for them. + * Added Debian build version to compiler full version. + + -- Abou Al Montacir Tue, 16 Dec 2008 23:23:00 +0100 + +fpc (2.2.2-7) unstable; urgency=low + + [ Abou Al Montacir ] + * Patches were not applyed by patch system, fixed. (Closes: Bug#508415) + + -- Torsten Werner Mon, 15 Dec 2008 06:12:58 +0100 + +fpc (2.2.2-6) unstable; urgency=low + + * Remove auto-generated make files in clean target to avoid lintian warning + (Closes: Bug#508013). + * Removed gtk file system bindings as these no more exist in new gtk + libraries. (Closes: Bug#507520) + + -- Abou Al Montacir Wed, 04 Dec 2008 12:21:00 +0100 + +fpc (2.2.2-5) unstable; urgency=low + + * Added missing man pages to remove lintian warnings. + * Fixed bug in clean-patched target causing configuration files to be removed + before arch independent packages are build. + * Updated description of fp-docs package. (Closes: Bug#506065) + customizations. + * Fixed dependencies in rules file speeding package generation by avoiding + rebuilding binaries up to four times. + + -- Abou Al Montacir Thu, 18 Nov 2008 16:50:00 +0100 + +fpc (2.2.2-4) unstable; urgency=low + + [ Torsten Werner ] + * Update ABI version in fpc-depends automatically. + * Remove empty directories from binary package fpc-source. + + [ Abou Al Montacir ] + * Removed leading path when calling update-alternatives to remove a Lintian + error. + * Fixed clean target. + * Improved description of packages. (Closes: #498882) + + -- Abou Al Montacir Thu, 09 Oct 2008 23:29:00 +0200 + +fpc (2.2.2-3) unstable; urgency=low + + * Add *.fpc files to the binary package fpc-source. + + -- Torsten Werner Wed, 20 Aug 2008 01:07:06 +0200 + +fpc (2.2.2-2) unstable; urgency=low + + * Add patch manpages.diff that fixes various errors in the man pages. + * Switch from dpatch to quilt. + * Yak shaving to make lintian happy: remove unneeded files from binary + package fpc-source. + * Fix Provides: field of fp-unit-rtl. + + -- Torsten Werner Sun, 17 Aug 2008 15:10:22 +0200 + +fpc (2.2.2-1) unstable; urgency=low + + [ Abou Al Montacir ] + * new upstream release + - shlobj changes + - fix for wince library support + - fix for windows 64 bit support for >2GB memory + - Documentation was updated completely to conform to the actual state of + the compiler and RTL. + - Possible CodeGear Copyright infringements in the source were reworked + using cleanroom approach. + * Remove all patches that are now obsolete. + + [ Torsten Werner ] + * Bump up Standards-Version: 3.8.0 (no changes needed). + * Do not install extra license files. + * Fix some other lintian warnings. + + -- Torsten Werner Tue, 12 Aug 2008 16:55:14 +0200 + +fpc (2.2.0-dfsg1-9) unstable; urgency=low + + [ Torsten Werner ] + * Add Abou Al Montacir to Uploaders field. + + [ Abou Al Montacir ] + * Moved FPC sources into a version dependent directory from /usr/share/fpcsrc + to /usr/share/fpcsrc/${FPCVERSION}. This allow installing more than on FPC + release. + * Fixed far call issue in compiler preventing building huge binearies. + (closes: #477743) + * Updated building dependencies, recomennded and suggested packages. + * Moved fppkg to fp-utils as it is just a helper tool and is not required by + compiler. + + -- Abou Al Montacir Sat, 17 May 2008 17:12:11 +0200 + +fpc (2.2.0-dfsg1-8) unstable; urgency=low + + [ Abou Al Montacir ] + * Fixed build of fpc-source package cased by accidental remove of + fpc-source.install file during clean-patched target execution. + * Fixed Build-Depend clause (needs binutils instead of binutils-dev and no + need for libgpmg1-dev). + * Added man pages to the same packages including corresponding binaries. + * Removed from fpc-source code which isn't required by Lazarus code tool. + + -- Abou Al Montacir Thu, 08 May 2008 17:45:19 +0200 + +fpc (2.2.0-dfsg1-7) unstable; urgency=low + + [ Abou Al Montacir ] + * Added make files to source package. This required by fpcmake tool to succeed + cross platform compilation. + * Added man pages for fpcmkcfg, fpcsubst, fpcres, mkxmlrpc and rmcvsdir + binaries. + + -- Abou Al Montacir Wed, 30 Apr 2008 16:01:50 +0200 + +fpc (2.2.0-dfsg1-6) unstable; urgency=medium + + * Remove the patch 09_powerpc again because the bug is in libgdb-dev and + will be fixed there. + * Disable Build-Depends: libexpat1-dev, libgdb-dev because fpc is + incompatible to gdb 6.8. (Closes: #473955) + * Set urgency to medium because we are fixing a FTBFS bug only. + + -- Torsten Werner Sat, 29 Mar 2008 23:31:44 +0100 + +fpc (2.2.0-dfsg1-5) unstable; urgency=low + + [ Abou Al Montacir ] + * Applied fixes from upstream to packages/fcl-xml + + [ Torsten Werner ] + * Add a new patch 09_powerpc to make the package builds on powerpc + architecture. + + -- Torsten Werner Sat, 29 Mar 2008 10:39:26 +0100 + +fpc (2.2.0-dfsg1-4) unstable; urgency=low + + * Build fp-ide with debugger support. (Closes: #328701) + * Remove unneeded Build-Depends: findutils. + * Update Standards-Version: 3.7.3. + * Change Depends: mawk | awk. + * Clean up some lintian errors and warnings. + + -- Torsten Werner Sat, 15 Mar 2008 19:18:23 +0100 + +fpc (2.2.0-dfsg1-3) unstable; urgency=low + + * Add files matching *.inc to package fpc-source. + + -- Torsten Werner Sat, 29 Dec 2007 22:29:07 +0100 + +fpc (2.2.0-dfsg1-2) unstable; urgency=low + + [ Torsten Werner ] + * Set Architecture: all for fpc package. + * Fix bug in debian/rules: it's $(FPCVERSION) not $(FPC_VERSION). + (Closes: #457951) + + [ Abou Al Montacir ] + * New patch from upstream fixes non-deterministic register allocation on + sparc + * Modified rules to apply patches before building compiler + + -- Torsten Werner Sat, 29 Dec 2007 15:49:57 +0100 + +fpc (2.2.0-dfsg1-1) unstable; urgency=low + + * Remove all files matching *.o from upstream's tarball. + * Change fpc-source package: + - Do not copy directories installer and tests because they are not needed + by lazarus. + - Install only files matching *.pas and *.pp. + * Clean up the XXXVERSION cruft in debian/rules and debian/fixdeb. + * Update FSF address in debian/copyright. + + -- Torsten Werner Thu, 20 Dec 2007 18:46:55 +0100 + +fpc (2.2.0-3) unstable; urgency=low + + * Create binary package fpc-source again after having some discussion on + debian-devel. (Closes: #413805) + * Use bzip2 when creating binary packages and add + Pre-Depends: dpkg (>= 1.10.24). + * Add the fpc-depends tool. + + -- Torsten Werner Sun, 09 Dec 2007 22:35:01 +0100 + +fpc (2.2.0-2) unstable; urgency=low + + [ Abou Al Montacir ] + * Added dbase to fcl-db packaged units for arch other than i386. + * Fixed build issue for sparc and powerpc arch. + + -- Torsten Werner Fri, 07 Dec 2007 09:22:17 +0100 + +fpc (2.2.0-1) unstable; urgency=low + + [ Carlos Laviola ] + * New upstream release. (Closes: #442206) + * Added arm as a supported arch. (Closes: #408693) + * fp-units-gfx depends on libggi-dev. (Closes: #423659) + * fp-ide bugs fixed in the new version. (Closes: #423099, #423601, #423602) + * general cleanup on debian/{rules,control,...} + + [ Torsten Werner ] + * Complete debian/copyright. + * Add debian/watch and get-orig-source target in debian/rules. + * Remove *.dll, *.exe, and *.log from upstream tarball. + + -- Torsten Werner Fri, 23 Nov 2007 20:30:45 +0100 + +fpc (2.0.4-5) unstable; urgency=low + + * Fixed Build-Depends. + * Add myself to Uploaders in debian/control. + * Make sure that the sources are really patched before building them. + * Build unit 'libc' on powerpc too. + + -- Torsten Werner Sat, 27 Jan 2007 20:08:50 +0100 + +fpc (2.0.4-4) unstable; urgency=low + + * debian/rules: Separate out the documentation build into build-doc to + stop the documentations from building on binary-arch builds resulting + in FTBFS. + * Add Index value in debian/fp-docs.doc-base (Closes: #407715) + + -- Varun Hiremath Sun, 21 Jan 2007 20:49:43 +0530 + +fpc (2.0.4-3) unstable; urgency=medium + + * Added dpatch as a build dependency. (Closes: #407594) + + -- Carlos Laviola Sun, 21 Jan 2007 17:08:58 -0200 + +fpc (2.0.4-2) unstable; urgency=low + + * New release fixes Bug: "fp-compiler: miscompiles multilevel + if-statement" (Closes: #403586) + * Provide html docs (Closes: #150150) + + debian/rules: Set DOCTYPE=html and use CONVERTER=hevea + + debian/control: Add hevea to Build-Depends + + -- Varun Hiremath Tue, 16 Jan 2007 21:53:01 +0530 + +fpc (2.0.4-1) unstable; urgency=low + + [ Abou Al Montacir ] + * New release (Closes: #383055) + + [ Torsten Werner ] + * Fix bugs in debian/fp-compiler.pre*.in. + * Updated debian/control to use variables provides by newer versions of + dpkg. + * Add XS-X-Vcs-Svn header to debian/control. + * Add german po files from Holger Wansing. (Closes: #348408, #346247) + * Remove unneeded debian/fp-compiler.conffiles. + * Fixed debian/changelog (lintian error). + * Changed Build-Depends: gawk | awk. + + [ Varun Hiremath ] + * Bump Standards version to 3.7.2 + * Add Homepage in debian/control file. + * Add fp-units-gtk2 missing dependencies (Closes: #337990) + + -- Torsten Werner Sun, 14 Jan 2007 11:40:59 +0100 + +fpc (2.0.4-rc3) unstable; urgency=low + + * New release candidate + + -- Abou Al Montacir Sun, 06 Aug 2006 19:00:00 +0200 + +fpc (2.0.4-rc2) unstable; urgency=low + + * New release candidate + + -- Abou Al Montacir Tue, 18 Jul 2006 21:23:26 +0200 + +fpc (2.0.4-rc1) unstable; urgency=low + + * New release + + -- Peter Vreman Thu, 07 Jul 2006 12:00:00 +0100 + +fpc (2.0.0-4) unstable; urgency=low + + * debian/control.in: add amd64 to the Architecture field. + + -- Carlos Laviola Fri, 9 Sep 2005 18:38:26 -0300 + +fpc (2.0.0-3) unstable; urgency=medium + + * Created a prerm and preinst for fp-compiler, as /usr/bin/fpc needs to + be removed from the list of 'pc' alternatives. (Closes: #311436) + * Added amd64 to the architecture list. (Closes: #315220) + + -- Carlos Laviola Fri, 2 Sep 2005 10:27:21 -0300 + +fpc (2.0.0-2) unstable; urgency=low + + * debian/fp-compiler.postinst.in: forgot to reapply the patch that + correctly creates the slave link to pc(1). (Closes: #310907) + + -- Carlos Laviola Mon, 30 May 2005 11:59:10 -0300 + +fpc (2.0.0-1) unstable; urgency=low + + * As I couldn't upload 1.9.8 on all supported architectures before 2.0.0 + was released, I'm rehashing its changelog now. + * New upstream release. + Bugs fixed on CVS before 1.9.8: + * man/man1/fpc.1: -OPn changed to -Opn in rev 1.8 (Closes: #255960) + * debian/fp-compiler.postinst.in: fixed in rev 1.5 (Closes: #269853) + Bugs fixed on CVS before 1.9.6: + * rtl/unix/crt.pp: fixed in rev 1.20 (Closes: #216060) + * rtl/i386/strings.inc: fixed in rev 1.16 (Closes: #288955) + * compiler/nadd.pas: fixed in rev 1.126 (Closes: #297881) + * debian/control: Added missing build dependencies on libgpmg1-dev and + libncurses5-dev and set save_size at build time, which finally makes + the package build without manual intervention. (Closes: #304633) + + -- Carlos Laviola Fri, 20 May 2005 19:07:00 -0300 + +fpc (1.9.6-2) unstable; urgency=low + + * debian/control: Oops -- fp-units-fv had the wrong description. + + -- Carlos Laviola Fri, 14 Jan 2005 13:15:50 -0200 + +fpc (1.9.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: Added build dependency on libgpmg1-dev. + + -- Carlos Laviola Fri, 31 Dec 2004 21:16:25 -0200 + +fpc (1.9.4-5) unstable; urgency=low + + * fp-compiler: needs ld, adding dependency on binutils. (Closes: #265265) + + -- Carlos Laviola Thu, 12 Aug 2004 16:29:37 -0300 + +fpc (1.9.4-4) unstable; urgency=low + + * debian/control.in: Oops, forgot to update the Build-Deps for this file, + which generates debian/control per se. (Closes: #263942) + + -- Carlos Laviola Sun, 8 Aug 2004 22:12:41 -0300 + +fpc (1.9.4-3) unstable; urgency=low + + * Package needs fpcmake to build pretty much everything, so we need to + build-dep on fp-utils. Thanks to Daniel Schepler for finding the bug + and for Jurij Smakov's aid. (Closes: #263942) + * debian/README.Debian: removes mentions to old problems with tetex, fixes + spelling mistakes and other minor issues. + + -- Carlos Laviola Fri, 6 Aug 2004 19:46:51 -0300 + +fpc (1.9.4-2) unstable; urgency=low + + * The following fixes are the work of Marco van de Voort from CVS HEAD: + - man/man1/ppc386.1: typo fix. (Closes: #255960) + - rtl/unix/crt.pp: gotoxy/XY2Ansi fixes from. + (Closes: #216057, #216060) + - docs/linuxex, docs/dosex, docs/refex: various examples ported to + fpc 1.9.x's new API. + + -- Carlos Laviola Tue, 20 Jul 2004 15:12:05 -0300 + +fpc (1.9.4-1) unstable; urgency=low + + * This release is partly the work of Peter Vreman . + * Acknowledging NMU. (Closes: #221316) + * Made the description for the units packages more informative. + (Closes: #209518, #209581, #209613) + * Applied some patches from Marco van de Voort to CVS HEAD that fixed + compiling the documentation on powerpc with some adaptations of mine. + + -- Carlos Laviola Sat, 17 Jul 2004 21:53:03 -0300 + +fpc (1.0.10-1.2) unstable; urgency=low + + * NMU + * debian/control: Also had to remove build dependency on latex2html here + (Closes: #221316) + + -- Roland Stigge Thu, 12 Feb 2004 10:27:20 +0100 + +fpc (1.0.10-1.1) unstable; urgency=low + + * NMU + * debian/control.in: Removed Build-Depends: latex2html which moved to + non-free (Closes: #221316) + + -- Roland Stigge Sat, 20 Dec 2003 20:45:41 +0100 + +fpc (1.0.10-1) unstable; urgency=low + + * New upstream release. + * Acknowledging Amaya's NMU. Thanks for the hand. (Closes: #141439) + * Package dependency lists corrected. (Closes: #84863, #155158) + * Example compiles correctly now. (Closes: #174371) + * Fixed vanishing fpc(1) manpage if gpc is installed. (Closes: #136283) + * Fixed manpage error. (Closes: #191695) + * Spelling mistakes are gone. (Closes: #124637, #124638) + * Both bugs (doc-base-file-references-usr-doc and debian-changelog-file- + contains-obsolete-user-emacs-settings, in lintian tags) were corrected + long ago. (Closes: #127092) + * Upstream have added the AddDisk function. (Closes: #103163) + + -- Carlos Laviola Sat, 2 Aug 2003 04:35:51 -0300 + +fpc (1.0.6-2) unstable; urgency=low + + * NMU for Debcamp BSP. + * Apply a very silly patch (Closes: #141439), which was RC. The PDF file now + builds. + * Updated versioned-build-depends-on-debhelper. + + -- Amaya Rodrigo Sastre Sat, 12 Jul 2003 17:58:50 +0200 + +fpc (1.0.6-1) unstable; urgency=low + + * New upstream version. (Closes: #154199) + + -- Carlos Laviola Sat, 10 Aug 2002 04:26:15 -0300 + +fpc (1.0.4+1.0.6cvs20020228-1) unstable; urgency=low + + * New upstream version. + + -- Peter Vreman Tue, 1 Mar 2002 11:01:50 +0100 + +fpc (1.0.4-2) unstable; urgency=low + + * New maintainer. + * debian/README.Debian: Added a note on building 'pdflatex.fmt', which is + needed by pdflatex, in order to build the documentation in PDF format. + * debian/control: added latex2html, dvipdfm and tetex-extra to the + build-deps list. + + -- Carlos Laviola Wed, 29 Aug 2001 23:15:17 -0300 + +fpc (1.0.4-1) unstable; urgency=low + + * New upstream version. + + -- Ulf Jaenicke-Roessler Tue, 2 Jan 2001 11:01:50 +0100 + +fpc (1.0.3-0.20001206.1) unstable; urgency=low + + * Snapshot release from CVS 2000/12/06. + * Fixes internal compiler error on (buggy) appearance of + array of Date (Closes:#60720). + * ppc386 can be called more intuitively as fpc (Closes:#74810). + * Help option '-h' is (somewhat) more propagated than '-?' + (Closes:#74811). Furthermore, help is displayed when fpc + is called without any parameter. + * Package supports alternatives now, in order to be used as + "Pascal compiler" (pc) from Makefile(s) (Closes:#76615). + + -- Ulf Jaenicke-Roessler Wed, 6 Dec 2000 11:29:28 +0100 + +fpc (1.0.2-1) unstable; urgency=low + + * New upstream version. + * Maintainer field changed. + * Bug#60720 had already been fixed in the development tree some + time ago after the last upload (hence, this Closes: #60720). + + -- Ulf Jaenicke-Roessler Fri, 13 Oct 2000 13:11:34 +0200 + +fpc (1.0.1-0.20000811.1) unstable; urgency=low + + * Built for `official' upload. CVS as of 2000/08/11 - NMU. + * Update to latest version, thus Closes: #56873. + * Removes /usr/bin/ppc386 link upon package removal. Closes: #64403. + * This upload also Closes: #68801. + * Added Build-Depends. Hmmm, 'fp-compiler' is somehow like `the chicken + and the egg' story... + + -- Ulf Jaenicke-Roessler Fri, 11 Aug 2000 22:49:37 +0200 + +fpc (1.0.1-0) unstable; urgency=low + + * New Upstream Release + + -- Peter Vreman Sun, 09 Jun 2000 12:00:00 +0200 + +fpc (0.99.13-19991013-4) unstable; urgency=low + + * Fixed bashism in samplecfg (Closes: Bug#50636) + * Changed source-arch to 'i386' (Closes: Bug#50438) + + -- Mika Fischer Sat, 20 Nov 1999 22:18:11 +0100 + +fpc (0.99.13-19991013-3) unstable; urgency=low + + * Fixed bug which overwrote existing config files during an update + (Closes: Bug#50278) + + -- Mika Fischer Tue, 16 Nov 1999 23:57:36 +0100 + +fpc (0.99.13-19991013-2) unstable; urgency=low + + * Fixed bug in debian/rules (Fixes: #50096) + + -- Mika Fischer Sat, 13 Nov 1999 20:31:20 +0100 + +fpc (0.99.13-19991013-1) unstable; urgency=low + + * Removed fp-fv due to licensing issues. + + -- Mika Fischer Wed, 13 Oct 1999 19:33:30 +0200 + +fpc (0.99.13-19991005-1) unstable; urgency=low + + * New maintainer + + -- Mika Fischer Wed, 13 Oct 1999 19:33:13 +0200 + +fpc (0.99.13-19991001-1) unstable; urgency=low + + * New maintainer + * Updated to policy 3.0.1 + + -- Joseph Carter Tue, 27 Jul 1999 18:05:05 -0700 + +fpc (0.99.12b-1) unstable; urgency=low + + * New Upstream Release + + -- Peter Vreman Thu, 10 Jun 1999 12:00:00 +0200 + +fpc (0.99.12a-1) unstable; urgency=low + + * Initial Release + + -- Peter Vreman Thu, 10 Jun 1999 12:00:00 +0200 --- fpc-2.4.0.orig/debian/fp-units-i386.install.in +++ fpc-2.4.0/debian/fp-units-i386.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-i386 + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/libc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/unixutil --- fpc-2.4.0.orig/debian/fp-docs.install.in +++ fpc-2.4.0/debian/fp-docs.install.in @@ -0,0 +1 @@ +/usr/share/doc/fp-docs --- fpc-2.4.0.orig/debian/fp-units-fv.install.in +++ fpc-2.4.0/debian/fp-units-fv.install.in @@ -0,0 +1,2 @@ +/usr/share/doc/fp-units-fv +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fv --- fpc-2.4.0.orig/debian/fp-compiler.postrm.in +++ fpc-2.4.0/debian/fp-compiler.postrm.in @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +FPCDIR=/usr/lib/fpc/%{fpcversion} + +# remove link +rm -f /usr/bin/%{ppcbin} + +# Debhelper code +#DEBHELPER# --- fpc-2.4.0.orig/debian/fp-compiler.postinst.in +++ fpc-2.4.0/debian/fp-compiler.postinst.in @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +FPCDIR=/usr/lib/fpc/%{fpcversion} + +# add alternative +update-alternatives \ + --install /usr/bin/pc pc /usr/bin/fpc 20 \ + --slave /usr/share/man/man1/pc.1.gz pc.1.gz /usr/share/man/man1/fpc.1.gz + +# create link +ln -sf $FPCDIR/%{ppcbin} /usr/bin/%{ppcbin} + +# Debhelper code +#DEBHELPER# --- fpc-2.4.0.orig/debian/fp-units-fcl.install.in +++ fpc-2.4.0/debian/fp-units-fcl.install.in @@ -0,0 +1,14 @@ +/usr/share/doc/fp-units-fcl +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-base +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-db +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-fpcunit +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-image +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-net +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-passrc +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-registry +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-res +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-web +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-xml +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-async +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-json +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fcl-process --- fpc-2.4.0.orig/debian/fp-units-gtk.install.in +++ fpc-2.4.0/debian/fp-units-gtk.install.in @@ -0,0 +1,4 @@ +/usr/share/doc/fp-units-gtk + +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/gtk1 +/usr/lib/fpc/%{fpcversion}/units/%{fpctarget}/fpgtk --- fpc-2.4.0.orig/debian/overrides/fp-utils +++ fpc-2.4.0/debian/overrides/fp-utils @@ -0,0 +1,6 @@ +# Free pascal binaries are often statically linked. +fp-utils binary: statically-linked-binary +# The Free Pascal Compiler does not properly support linking. Please +# see BTS #472304. The zlib functionality is provided without a proper +# way to turn it off. +fp-utils: embedded-zlib --- fpc-2.4.0.orig/debian/overrides/fp-units-base +++ fpc-2.4.0/debian/overrides/fp-units-base @@ -0,0 +1,4 @@ +# The Free Pascal Compiler does not properly support linking. Please +# see BTS #472304. The zlib functionality is provided without a proper +# way to turn it off. +fp-units-base: embedded-zlib --- fpc-2.4.0.orig/debian/overrides/fp-compiler +++ fpc-2.4.0/debian/overrides/fp-compiler @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-compiler binary: statically-linked-binary --- fpc-2.4.0.orig/debian/overrides/fp-ide +++ fpc-2.4.0/debian/overrides/fp-ide @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-ide binary: statically-linked-binary --- fpc-2.4.0.orig/debian/overrides/fp-units-net +++ fpc-2.4.0/debian/overrides/fp-units-net @@ -0,0 +1,2 @@ +# The name of the unit is dbus not D-Bus. +fp-units-net binary: capitalization-error-in-description dbus D-Bus --- fpc-2.4.0.orig/debian/overrides/fp-units-gfx +++ fpc-2.4.0/debian/overrides/fp-units-gfx @@ -0,0 +1,2 @@ +# Free pascal binaries are often statically linked. +fp-units-gfx binary: statically-linked-binary --- fpc-2.4.0.orig/debian/overrides/fp-units-rtl +++ fpc-2.4.0/debian/overrides/fp-units-rtl @@ -0,0 +1 @@ +fp-units-rtl: spelling-error-in-binary ./usr/lib/fpc/2.4.0/units/i386-linux/rtl/stdconvs.o ang and --- fpc-2.4.0.orig/debian/patches/version.diff +++ fpc-2.4.0/debian/patches/version.diff @@ -0,0 +1,27 @@ +This patch adds Debian build version to compiler full version. + +--- fpc-2.2.4~/fpcsrc/compiler/version.pas ++++ fpc-2.2.4/fpcsrc/compiler/version.pas +@@ -78,6 +78,9 @@ + + implementation + ++const ++ FullVersionString={$INCLUDE version.inc}; ++ + function version_string:string; + begin + version_string := version_nr+'.'+release_nr+'.'+patch_nr; +@@ -86,11 +89,7 @@ + + function full_version_string:string; + begin +- full_version_string := version_nr+'.'+release_nr+'.'+patch_nr+minorpatch +-{$ifdef REVINC} +- +'-r'+{$i revision.inc} +-{$endif REVINC} +- ; ++ full_version_string := FullVersionString; + end; + + end. --- fpc-2.4.0.orig/debian/patches/pred_succ.diff +++ fpc-2.4.0/debian/patches/pred_succ.diff @@ -0,0 +1,44 @@ +This patch fixed Pred/Succ issue as described by bug#569023. +Applied upstream. + +diff -uNrp fpc-2.4.0.orig/fpcsrc/compiler/ninl.pas fpc-2.4.0/fpcsrc/compiler/ninl.pas +--- fpc-2.4.0.orig/fpcsrc/compiler/ninl.pas 2009-09-28 17:33:41.000000000 +0200 ++++ fpc-2.4.0/fpcsrc/compiler/ninl.pas 2010-02-09 11:06:17.000000000 +0100 +@@ -1410,7 +1410,6 @@ + hp : tnode; + vl,vl2 : TConstExprInt; + vr : bestreal; +- checkrange: boolean; + + begin { simplify } + result:=nil; +@@ -1632,16 +1631,20 @@ + in_pred_x, + in_succ_x: + begin +- { only perform range checking if the result is an enum } +- checkrange:=(resultdef.typ=enumdef); +- + if (left.nodetype=ordconstn) then +- begin +- if (inlinenumber=in_succ_x) then +- result:=cordconstnode.create(tordconstnode(left).value+1,left.resultdef,checkrange) +- else +- result:=cordconstnode.create(tordconstnode(left).value-1,left.resultdef,checkrange); +- end; ++ begin ++ if (inlinenumber=in_succ_x) then ++ vl:=tordconstnode(left).value+1 ++ else ++ vl:=tordconstnode(left).value-1; ++ if is_integer(left.resultdef) then ++ { the type of the original integer constant is irrelevant, ++ it should be automatically adapted to the new value } ++ result:=genintconstnode(vl) ++ else ++ { check the range for enums, chars, booleans } ++ result:=cordconstnode.create(vl,left.resultdef,true) ++ end + end; + in_low_x, + in_high_x: --- fpc-2.4.0.orig/debian/patches/series +++ fpc-2.4.0/debian/patches/series @@ -0,0 +1,5 @@ +version.diff +documentation.diff +spell_errors.diff +man_files.diff +pred_succ.diff --- fpc-2.4.0.orig/debian/patches/spell_errors.diff +++ fpc-2.4.0/debian/patches/spell_errors.diff @@ -0,0 +1,4913 @@ +This patch fixes spell errors in code strings and in documentation. + +Index: fpcbuild-2.4.0/fpcdocs/classchart.ps +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/classchart.ps (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/classchart.ps (working copy) +@@ -76,7 +76,7 @@ + % save parameters + /status exch def + /classname exch def +- % save enviroment ++ % save environment + gsave + newpath + +@@ -140,7 +140,7 @@ + % save parameters + /status exch def + /classname exch def +- % save enviroment ++ % save environment + gsave + newpath + +@@ -210,7 +210,7 @@ + % save parameters + /status exch def + /classname exch def +- % save enviroment ++ % save environment + % push this on the stack for onelevelback + nexty + newpath +@@ -269,7 +269,7 @@ + /offsetx exch def + /status exch def + /classname exch def +- % save enviroment ++ % save environment + % push this on the stack for onemovelevelback + nextx + nexty +Index: fpcbuild-2.4.0/fpcdocs/internal/comparch.tex +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/internal/comparch.tex (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/internal/comparch.tex (working copy) +@@ -109,7 +109,7 @@ + \label{subsubsec:input} + + The input data is handled via the standard way of handling all the I/O in +-the compiler. That is to say, that it is a hook which can be overriden in ++the compiler. That is to say, that it is a hook which can be overridden in + \textbf{comphook.pas (do{\_}openinputfile)}, in case where another I/O + method wants to be used. + +@@ -1481,7 +1481,7 @@ + ??? \\ + & \textsf{proptype : ttype;}& + Indicates the type of the property\\ +-& \textsf{propoverriden : ppropertysym;}& ++& \textsf{propoverridden : ppropertysym;}& + ??? \\ + & \textsf{indextype : ttype;}& \\ + & \textsf{index : longint;}& +@@ -2123,7 +2123,7 @@ + \textsf{po{\_}abstractmethod}& This is an abstract method \\ + \textsf{po{\_}staticmethod} & This is a static method \\ + \textsf{po{\_}overridingmethod}& +- This is an overriden method (with po{\_}virtual flag usually) \\ ++ This is an overridden method (with po{\_}virtual flag usually) \\ + \textsf{po{\_}methodpointer}& + This is a method pointer (not a normal routine pointer) \\ + \textsf{po{\_}containsself}& +Index: fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx (working copy) +@@ -11043,7 +11043,7 @@ + % + % + % \paragraph{Helpers} +-% Our goal is to define the yet unkown |\lst@UseFormat|. This definition ++% Our goal is to define the yet unknown |\lst@UseFormat|. This definition + % will parse the user supplied format. We start with some general macros. + % + % \begin{macro}{\lst@fmtSplit} +Index: fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex (working copy) +@@ -157,7 +157,7 @@ + \verb|longint| Free Pascal type to match it. Here we call the + \verb|ctypes.cint32| type converter. This method shall be prefered. + +-For type conversion of C types it is usefull to take a look at the ++For type conversion of C types it is useful to take a look at the + C/C++ header \verb|limits.h|. On Linux systems it is usually located in + \verb|/lib/include/|. For Free Pascal conversion, it shall be safer to take a + look to the documentation \cite{FPDoc,FPFor}. +Index: fpcbuild-2.4.0/fpcdocs/matrix.xml +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/matrix.xml (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/matrix.xml (working copy) +@@ -3520,7 +3520,7 @@ + + This operator allows you to use a three-dimensional matrix with extended precision + values wherever a two-dimensional matrix with double precision is expected. +- The surplus fields are thrown away and some accuracy is lost becuase of the ++ The surplus fields are thrown away and some accuracy is lost beacause of the + conversion. + + +@@ -5629,4 +5629,4 @@ + + Procedural variable, called when checking 2 strings for resemblances in +- This procedural variable is standard set to but can be overriden with a user-defined algorithm. ++ This procedural variable is standard set to but can be overridden with a user-defined algorithm. + This algorithm should return True if AText resembles AOtherText, or False otherwise. + The standard routine compares the soundexes of the two strings and returns True if they are equal. + None +Index: fpcbuild-2.4.0/fpcdocs/sqldb.xml +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/sqldb.xml (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/sqldb.xml (working copy) +@@ -837,7 +837,7 @@ + The name of the Host Computer where the SQL server or client is resident and to which connection is to be made + +

The name of the Host Computer where the SQL server or client is resident and to which connection is to be made

+-

This property can be pre-set in the Object Inspector during programme testing or if the programme is always going to run on the same machine, but more usually and more usefully would be set in a log-in dialog along with the UserName and Password.

++

This property can be pre-set in the Object Inspector during programme testing or if the programme is always going to run on the same machine, but more usually and more usefuly would be set in a log-in dialog along with the UserName and Password.

+ + + +Index: fpcbuild-2.4.0/fpcdocs/gtk2.tex +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/gtk2.tex (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/gtk2.tex (working copy) +@@ -845,7 +845,7 @@ + end; + \end{lstlisting} + The \lstinline|realize| and \lstinline|size_allocate| of the parent widget +-\lstinline|GTKDigit| are overriden here. Also 2 events callbacks are ++\lstinline|GTKDigit| are overridden here. Also 2 events callbacks are + assigned in order to react on mouse clicks. + + The object initialization function must undo some work that was done +Index: fpcbuild-2.4.0/fpcdocs/user.tex +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/user.tex (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/user.tex (working copy) +@@ -3549,7 +3549,7 @@ + This opcode cannot be prefixed by this instruction. + + \item [Invalid combination of override and opcode] +-This opcode cannot be overriden by this combination. ++This opcode cannot be overridden by this combination. + + \item [Too many operands on line] + At most three operand instructions exist on the m68k, and i386, you +Index: fpcbuild-2.4.0/fpcdocs/sysutils.xml +=================================================================== +--- fpcbuild-2.4.0/fpcdocs/sysutils.xml (revision 633) ++++ fpcbuild-2.4.0/fpcdocs/sysutils.xml (working copy) +@@ -3497,7 +3497,7 @@ + + Note that on Windows, environment strings can start with an equal sign (=). + This is a trick used to pass the current working directory to a newly created +-proces. In this case, extracting the variable name as the characters before ++process. In this case, extracting the variable name as the characters before + the first equal sign will result in an empty name. + + +@@ -3537,7 +3537,7 @@ + and quote rules. + + +-In case the program could not be executed or an other error occurs, ++In case the program could not be executed or another error occurs, + an exception will be raised. + + +Index: fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini (working copy) +@@ -1258,7 +1258,7 @@ + DATESTR= + endif + +-# Look if UPX is found for go32v2 and win32. We can't use $UPX becuase ++# Look if UPX is found for go32v2 and win32. We can't use $UPX because + # upx uses that one itself (PFV) + ifndef UPXPROG + ifeq ($(OS_TARGET),go32v2) +Index: fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm (working copy) +@@ -87,6 +87,6 @@ + + + [rules] +-; here you can add your own rules, the general rules will automaticly ++; here you can add your own rules, the general rules will automatically + ; remove the defaults which call fpc_. + +Index: fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp (working copy) +@@ -21,7 +21,7 @@ + SErrMissingInstallPackage = 'Could not find package "%s"'; + SErrNoPackageSpecified = 'No package specified'; + SErrNoPackageAvailable = 'Package %s %s is not available'; +- SErrOnlyLocalDir = 'The speficied command "%s" works only on current dir, not on a (remote) package'; ++ SErrOnlyLocalDir = 'The specified command "%s" works only on current dir, not on a (remote) package'; + SErrExecutionFPMake = 'Execution of FPMake %s failed'; + SErrException = 'The FPC Package tool encountered the following error:'; + SErrActionAlreadyRegistered= 'Action "%s" is already registered'; +Index: fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y (working copy) +@@ -655,7 +655,7 @@ + write(outfile,'args:array of const'); + (* if variable number of args we must allways pop *) + no_pop:=false; +- (* Needs 2 declarations, also one without args, becuase ++ (* Needs 2 declarations, also one without args, because + in C you can omit the second parameter. Default parameter + doesn't help as that isn't possible with array of const *) + NeedEllipsisOverload:=true; +Index: fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas (working copy) +@@ -659,7 +659,7 @@ + write(outfile,'args:array of const'); + (* if variable number of args we must allways pop *) + no_pop:=false; +- (* Needs 2 declarations, also one without args, becuase ++ (* Needs 2 declarations, also one without args, because + in C you can omit the second parameter. Default parameter + doesn't help as that isn't possible with array of const *) + NeedEllipsisOverload:=true; +Index: fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas (working copy) +@@ -211,7 +211,7 @@ + procedure ShowTopic(SourceFileID: word; Context: THelpCtx); virtual; + procedure HandleEvent(var Event: TEvent); virtual; + procedure Close; virtual; +- function GetPalette: PPalette; virtual; { needs to be overriden } ++ function GetPalette: PPalette; virtual; { needs to be overridden } + end; + + implementation +Index: fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas (working copy) +@@ -210,7 +210,7 @@ + {$else} + const + {$endif} +- msg_automaticallycreateddontedit = 'Automaticly created file, don''t edit.'; ++ msg_automaticallycreateddontedit = 'Automatically created file, don''t edit.'; + + { Compiler options } + opt_objectpascal = 'Object pascal support'; +Index: fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas (working copy) +@@ -724,7 +724,7 @@ + end; + + Function THTMLTopicRenderer.CanonicalizeURL(const Base,Relative:String):string; +-// uses info from filesystem (curdir) -> overriden for CHM. ++// uses info from filesystem (curdir) -> overridden for CHM. + begin + CanonicalizeURL:=CompleteURL(Base,relative); + end; +Index: fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp (working copy) +@@ -114,7 +114,7 @@ + Function StringToPPChar(Var S:String;ReserveEntries:integer):ppchar; + { + Create a PPChar to structure of pchars which are the arguments specified +- in the string S. Especially usefull for creating an ArgV for Exec-calls ++ in the string S. Especially useful for creating an ArgV for Exec-calls + Note that the string S is destroyed by this call. + } + +@@ -126,7 +126,7 @@ + Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar; + { + Create a PPChar to structure of pchars which are the arguments specified +- in the string S. Especially usefull for creating an ArgV for Exec-calls ++ in the string S. Especially useful for creating an ArgV for Exec-calls + } + + begin +Index: fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp (working copy) +@@ -103,7 +103,7 @@ + + + {$ifdef CPUARM} +-{ the external directive isn't really necessary here because it is overriden by external (FK) } ++{ the external directive isn't really necessary here because it is overridden by external (FK) } + + function addd(d1,d2 : double) : double; compilerproc; + cdecl;external 'coredll' name '__addd'; +Index: fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp (working copy) +@@ -226,7 +226,7 @@ + PgmInputs:PChar; {Command parameters (nil allowed).} + TermQ:PChar; {System queue. (nil allowed).} + Environment:PChar; {Environment to pass (nil allowed).} +- InheritOpt:word; {Inherit enviroment from shell/ ++ InheritOpt:word; {Inherit environment from shell/ + inherit environment from parent (0/1).} + SessionType:word; {Auto/full screen/window/presentation + manager/full screen Dos/windowed Dos +Index: fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile (working copy) +@@ -54,7 +54,7 @@ + sed -n -e "s/Addr:\(.*\)Ord:\(.*\)Name: \(.*\)/@\3@/p" $*.tmp > $*.exd + # -rm $*.tmp + +-# list of usefull dll's for windows.pp ++# list of useful dll's for windows.pp + dllexps : gdi32.exp kernel32.exp advapi32.exp user32.exp mapi32.exp \ + comdlg32.exp shell32.exp mpr.exp comctl32.exp version.exp \ + opengl32.exp spoolss.exp winspool.exd +Index: fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc (working copy) +@@ -191,7 +191,7 @@ + function GetStdHandle(nStdHandle:DWORD):THANDLE; + stdcall;external KernelDLL name 'GetStdHandle'; + +- { command line/enviroment functions } ++ { command line/environment functions } + function GetCommandLine : pchar; + stdcall;external KernelDLL name 'GetCommandLineA'; + +Index: fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp (working copy) +@@ -100,7 +100,7 @@ + + function GetFileVersion(const AFileName:string):Cardinal; + var +- { usefull only as long as we don't need to touch different stack pages } ++ { useful only as long as we don't need to touch different stack pages } + buf : array[0..3071] of byte; + bufp : pointer; + fn : string; +Index: fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp (working copy) +@@ -5176,7 +5176,7 @@ + Function StringToPPChar(Var S:String):ppchar; + { + Create a PPChar to structure of pchars which are the arguments specified +- in the string S. Especially usefull for creating an ArgV for Exec-calls ++ in the string S. Especially useful for creating an ArgV for Exec-calls + Note that the string S is destroyed by this call. + } + +@@ -5188,7 +5188,7 @@ + Function StringToPPChar(Var S:AnsiString):ppchar; + { + Create a PPChar to structure of pchars which are the arguments specified +- in the string S. Especially usefull for creating an ArgV for Exec-calls ++ in the string S. Especially useful for creating an ArgV for Exec-calls + } + + begin +Index: fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp (working copy) +@@ -263,7 +263,7 @@ + PgmInputs:PChar; {Command parameters (nil allowed).} + TermQ:PChar; {System queue. (nil allowed).} + Environment:PChar; {Environment to pass (nil allowed).} +- InheritOpt:word; {Inherit enviroment from shell/ ++ InheritOpt:word; {Inherit environment from shell/ + inherit environment from parent (0/1).} + SessionType:word; {Auto/full screen/window/presentation + manager/full screen Dos/windowed Dos +Index: fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas (working copy) +@@ -2860,7 +2860,7 @@ + PgmInputs:PChar; {Command parameters (nil allowed).} + TermQ:PChar; {System queue. (nil allowed).} + Environment:PChar; {Environment to pass (nil allowed).} +- InheritOpt:word; {Inherit enviroment from shell/ ++ InheritOpt:word; {Inherit environment from shell/ + inherit environment from parent + (0/1).} + SessionType:word; {Auto/full screen/window/presentation +Index: fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp (working copy) +@@ -18,7 +18,7 @@ + {$Copyright (c) 2002 the FreePascal development team} + + +-{ using crt automaticly calls _SetAutoScreenDestructionMode (TRUE); ++{ using crt automatically calls _SetAutoScreenDestructionMode (TRUE); + so no "Press any key to close screeen" will be shown by netware } + uses crt; + +Index: fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt (working copy) +@@ -77,7 +77,7 @@ + #ENDIF + + This adds the search path for the rtl-units as well as for the needed import-files. +- You can use the import files from the rtl/netware directory, they are automaticly ++ You can use the import files from the rtl/netware directory, they are automatically + installed. If you want to use import files from novell, be aware that you have to + convert the files to unix format (i.e. with dos2unix). + +@@ -138,7 +138,7 @@ + searching import files via the specified library path (-Fl). If you plan to use + import files from novell be aware that they have to be converted from CR/LF to + LF only. The script 'convertimp' in rtl/netware/nwimp will do that. +- If a module name is specified in an import, the module is automaticly ++ If a module name is specified in an import, the module is automatically + declared as autoload by FreePascal. + + I.e. the following declaration needs nlmlib.imp and sets nlmlib.nlm as autoload: +Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc (working copy) +@@ -334,7 +334,7 @@ + { restore file position if not working with a device } + if not isdevice then + { if we didn't modify the buffer, simply restore the BufPos and BufEnd } +- { (the latter becuase it's now probably set to zero because nothing was } ++ { (the latter because it's now probably set to zero because nothing was } + { was read anymore) } + if (reads = 0) then + begin +Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc (working copy) +@@ -556,7 +556,7 @@ + parent directory and so on (Amiga). Please, note that you can decide + to support both '..' and DirectorySeparator as references to the parent + directory at the same time for compatibility reasons - however this +- support makes it impossible to use an otherwise possibly valid name ++ support makes it impossible to use anotherwise possibly valid name + of '..'. + + FPC_FEXPAND_DIRSEP_IS_CURDIR - DirectorySeparator at the beginning of +Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc (working copy) +@@ -1115,7 +1115,7 @@ + Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar; + { + Create a PPChar to structure of pchars which are the arguments specified +- in the string S. Especially usefull for creating an ArgV for Exec-calls ++ in the string S. Especially useful for creating an ArgV for Exec-calls + } + + begin +Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc (working copy) +@@ -213,7 +213,7 @@ + int_addref(pointer(newp)+sizeof(tdynarray)+elesize*i,eletype); + + { a declock(ref. count) isn't enough here } +- { it could be that the in MT enviroments } ++ { it could be that the in MT environments } + { in the mean time the refcount was } + { decremented } + +Index: fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp (working copy) +@@ -37,9 +37,9 @@ + function VPos(UTF8Char:PChar; Len:integer; BytePos:integer):Cardinal; + {Returns character at a given visual position according to paragraph direction} + function VCharOf(Src:TString; vp:Integer; dir:TDirection):TCharacter; +-{Inserts a string into an other paying attention of RTL/LTR direction} ++{Inserts a string into another paying attention of RTL/LTR direction} + procedure VInsert(const Src:TString; var Dest:TString; vp:Integer; pDir:TDirection); +-{Deletes a string into an other paying attention of RTL/LTR direction} ++{Deletes a string into another paying attention of RTL/LTR direction} + procedure VDelete(var str:TString; vp, len:Integer; pDir:TDirection); + {Resturns a sub string of source string} + //function VCopy(const Src:TString; vStart, vWidth:Integer):TString; +Index: fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp (working copy) +@@ -47,9 +47,9 @@ + function VPos(const UTF8Str:TUTF8String; lp:Integer; pDir, cDir:TDirection):Cardinal; + {Returns character at a given visual position according to paragraph direction} + function VCharOf(UTF8Str:TUTF8String; vp:Integer; dir:TDirection):TUTF8Char; +-{Inserts a string into an other paying attention of RTL/LTR direction} ++{Inserts a string into another paying attention of RTL/LTR direction} + procedure VInsert(const Src:TUTF8String; var Dest:TUTF8String; vp:Integer; pDir:TDirection); +-{Deletes a string into an other paying attention of RTL/LTR direction} ++{Deletes a string into another paying attention of RTL/LTR direction} + procedure VDelete(var str:TUTF8String; vp, len:Integer; pDir:TDirection); + {****************************Helper routines***********************************} + {Returns direction of a character} +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp (working copy) +@@ -200,7 +200,7 @@ + bigstring: shortstring; s32: longint; s64: int64);saveregisters; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;saveregisters; +@@ -212,7 +212,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; +@@ -227,7 +227,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -235,7 +235,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters; + + { normal methods which call other methods } +@@ -243,7 +243,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; +@@ -462,8 +462,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; + begin + RunError(211); +@@ -503,10 +503,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -547,7 +547,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -555,7 +555,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -591,8 +591,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := u8; +@@ -614,10 +614,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1060,7 +1060,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1089,7 +1089,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1276,7 +1276,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1306,7 +1306,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1495,10 +1495,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1528,7 +1528,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1831,10 +1831,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1864,7 +1864,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2232,7 +2232,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2261,7 +2261,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2448,7 +2448,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2478,7 +2478,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2667,10 +2667,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2700,7 +2700,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3003,10 +3003,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3036,7 +3036,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp (working copy) +@@ -202,11 +202,11 @@ + bigstring: shortstring; s32: longint; s64: int64); + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;abstract; + procedure method_dynamic_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);dynamic; +- procedure method_dynamic_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_dynamic_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);dynamic;abstract; + class procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -218,7 +218,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +@@ -232,7 +232,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic; + procedure method_dynamic_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic; +- procedure method_dynamic_call_overriden_params_mixed( ++ procedure method_dynamic_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic; + procedure method_dynamic_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic; +@@ -247,7 +247,7 @@ + theritedvmtclass = class(tvmtclass) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -255,9 +255,9 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override; +- procedure method_dynamic_overriden_params_mixed( ++ procedure method_dynamic_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override; + + { normal methods which call other methods } +@@ -265,7 +265,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); +@@ -538,10 +538,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtclass.method_virtual_call_overriden_params_mixed( ++procedure tvmtclass.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -586,10 +586,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtclass.method_dynamic_call_overriden_params_mixed( ++procedure tvmtclass.method_dynamic_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -637,7 +637,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtclass.constructor_params_mixed_call_overriden( ++constructor theritedvmtclass.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + inherited create; +@@ -646,7 +646,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtclass.constructor_params_mixed_call_static( +@@ -685,7 +685,7 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtclass.method_virtual_overriden_params_mixed( ++procedure theritedvmtclass.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := u8; +@@ -695,7 +695,7 @@ + object_s64bit := s64; + end; + +-procedure theritedvmtclass.method_dynamic_overriden_params_mixed( ++procedure theritedvmtclass.method_dynamic_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := u8; +@@ -718,10 +718,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtclass.method_normal_call_overriden_params_mixed( ++procedure theritedvmtclass.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1167,7 +1167,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1196,7 +1196,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1408,7 +1408,7 @@ + + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...'); +- vmtclass.method_dynamic_overriden_params_mixed(RESULT_U8BIT, ++ vmtclass.method_dynamic_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1438,7 +1438,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass.method_dynamic_overriden_params_mixed(value_u8bit, ++ vmtclass.method_dynamic_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1494,7 +1494,7 @@ + + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtclass.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtclass.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1524,7 +1524,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtclass.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1713,10 +1713,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtclass.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtclass.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1746,7 +1746,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtclass.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2049,10 +2049,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtclass.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtclass.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2082,7 +2082,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtclass.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtclass.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2644,7 +2644,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2673,7 +2673,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2885,7 +2885,7 @@ + + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...'); +- method_dynamic_overriden_params_mixed(RESULT_U8BIT, ++ method_dynamic_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2915,7 +2915,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_dynamic_overriden_params_mixed(value_u8bit, ++ method_dynamic_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2971,7 +2971,7 @@ + + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3001,7 +3001,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3190,10 +3190,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3223,7 +3223,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3526,10 +3526,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtclass:=theritedvmtclass.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3559,7 +3559,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp (working copy) +@@ -198,7 +198,7 @@ + bigstring: shortstring; s32: longint; s64: int64);cdecl; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;cdecl; +@@ -210,7 +210,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +@@ -225,7 +225,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -233,7 +233,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + + { normal methods which call other methods } +@@ -241,7 +241,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl; +@@ -460,8 +460,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + RunError(211); +@@ -501,10 +501,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -545,7 +545,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -553,7 +553,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -589,8 +589,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := u8; +@@ -612,10 +612,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1058,7 +1058,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1087,7 +1087,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1274,7 +1274,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1304,7 +1304,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1493,10 +1493,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1526,7 +1526,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1829,10 +1829,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1862,7 +1862,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2229,7 +2229,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2258,7 +2258,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2445,7 +2445,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2475,7 +2475,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2664,10 +2664,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2697,7 +2697,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3000,10 +3000,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3033,7 +3033,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h (working copy) +@@ -62,7 +62,7 @@ + * ANSI C standard makes this an impossibility right from the + * very get go. Its really only meant to be useful for the vast + * majority of platforms that possess the capability of +- * implementing usefully and precisely defined, standard sized ++ * implementing usefuly and precisely defined, standard sized + * integer scalars. Systems which are not intrinsically 2s + * complement may produce invalid constants. + * +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp (working copy) +@@ -198,7 +198,7 @@ + bigstring: shortstring; s32: longint; s64: int64);register; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;register; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;register; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;register; +@@ -210,7 +210,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register; +@@ -225,7 +225,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -233,7 +233,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register; + + { normal methods which call other methods } +@@ -241,7 +241,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; +@@ -460,8 +460,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + begin + RunError(211); +@@ -501,10 +501,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -545,7 +545,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -553,7 +553,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -589,8 +589,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + begin + object_u8bit := u8; +@@ -612,10 +612,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1058,7 +1058,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1087,7 +1087,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1274,7 +1274,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1304,7 +1304,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1493,10 +1493,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1526,7 +1526,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1829,10 +1829,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1862,7 +1862,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2230,7 +2230,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2259,7 +2259,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2446,7 +2446,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2476,7 +2476,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2665,10 +2665,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2698,7 +2698,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3001,10 +3001,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3034,7 +3034,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp (working copy) +@@ -198,7 +198,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static; +@@ -210,7 +210,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; +@@ -225,7 +225,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -233,7 +233,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual; + + { normal methods which call other methods } +@@ -241,7 +241,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); +@@ -459,8 +459,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + RunError(211); +@@ -500,10 +500,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -544,7 +544,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -552,7 +552,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -588,8 +588,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := u8; +@@ -611,10 +611,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1057,7 +1057,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1086,7 +1086,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1273,7 +1273,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1303,7 +1303,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1492,10 +1492,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1525,7 +1525,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1828,10 +1828,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1861,7 +1861,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2227,7 +2227,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2256,7 +2256,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2443,7 +2443,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2473,7 +2473,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2662,10 +2662,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2695,7 +2695,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2998,10 +2998,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3031,7 +3031,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp (working copy) +@@ -200,7 +200,7 @@ + bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;oldfpccall; +@@ -212,7 +212,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; +@@ -227,7 +227,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -235,7 +235,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall; + + { normal methods which call other methods } +@@ -243,7 +243,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; +@@ -462,8 +462,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + begin + RunError(211); +@@ -503,10 +503,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -547,7 +547,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -555,7 +555,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -591,8 +591,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + begin + object_u8bit := u8; +@@ -614,10 +614,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1060,7 +1060,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1089,7 +1089,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1276,7 +1276,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1306,7 +1306,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1495,10 +1495,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1528,7 +1528,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1831,10 +1831,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1864,7 +1864,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2231,7 +2231,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2260,7 +2260,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2447,7 +2447,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2477,7 +2477,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2666,10 +2666,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2699,7 +2699,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3002,10 +3002,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3035,7 +3035,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp (working copy) +@@ -198,7 +198,7 @@ + bigstring: shortstring; s32: longint; s64: int64);stdcall; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;stdcall; +@@ -210,7 +210,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; +@@ -225,7 +225,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -233,7 +233,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall; + + { normal methods which call other methods } +@@ -241,7 +241,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; +@@ -460,8 +460,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + begin + RunError(211); +@@ -501,10 +501,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -545,7 +545,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -553,7 +553,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -589,8 +589,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + begin + object_u8bit := u8; +@@ -612,10 +612,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1058,7 +1058,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1087,7 +1087,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1274,7 +1274,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1304,7 +1304,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1493,10 +1493,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1526,7 +1526,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1829,10 +1829,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1862,7 +1862,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2230,7 +2230,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2259,7 +2259,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2446,7 +2446,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2476,7 +2476,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2665,10 +2665,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2698,7 +2698,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3001,10 +3001,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3034,7 +3034,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp (working copy) +@@ -198,7 +198,7 @@ + bigstring: shortstring; s32: longint; s64: int64);pascal; + procedure method_virtual_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; +- procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word; ++ procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; + procedure method_static_params_mixed(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64);static;pascal; +@@ -210,7 +210,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; + procedure method_virtual_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; +- procedure method_virtual_call_overriden_params_mixed( ++ procedure method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; + procedure method_virtual_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; +@@ -225,7 +225,7 @@ + theritedvmtobject = object(tvmtobject) + constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word; ++ constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_static(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +@@ -233,7 +233,7 @@ + bigstring: shortstring; s32: longint; s64: int64); + constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word; + bigstring: shortstring; s32: longint; s64: int64); +- procedure method_virtual_overriden_params_mixed( ++ procedure method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal; + + { normal methods which call other methods } +@@ -241,7 +241,7 @@ + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + procedure method_normal_call_virtual_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; +- procedure method_normal_call_overriden_params_mixed( ++ procedure method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + procedure method_normal_call_normal_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; +@@ -460,8 +460,8 @@ + object_s64bit := s64; + end; + +-{ this one should be overriden } +-procedure tvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure tvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + begin + RunError(211); +@@ -501,10 +501,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure tvmtobject.method_virtual_call_overriden_params_mixed( ++procedure tvmtobject.method_virtual_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -545,7 +545,7 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-constructor theritedvmtobject.constructor_params_mixed_call_overriden( ++constructor theritedvmtobject.constructor_params_mixed_call_overridden( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64); + begin + object_u8bit := 0; +@@ -553,7 +553,7 @@ + object_bigstring := ''; + object_s32bit := 0; + object_s64bit := 0; +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + constructor theritedvmtobject.constructor_params_mixed_call_static( +@@ -589,8 +589,8 @@ + inherited constructor_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-{ this one should be overriden } +-procedure theritedvmtobject.method_virtual_overriden_params_mixed( ++{ this one should be overridden } ++procedure theritedvmtobject.method_virtual_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + begin + object_u8bit := u8; +@@ -612,10 +612,10 @@ + method_virtual_params_mixed(u8, u16, bigstring, s32, s64); + end; + +-procedure theritedvmtobject.method_normal_call_overriden_params_mixed( ++procedure theritedvmtobject.method_normal_call_overridden_params_mixed( + u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal; + begin +- method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64); ++ method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64); + end; + + +@@ -1058,7 +1058,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1087,7 +1087,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.constructor_params_mixed_call_overriden(value_u8bit, ++ vmtobject.constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1274,7 +1274,7 @@ + + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1304,7 +1304,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1493,10 +1493,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1526,7 +1526,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_normal_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1829,10 +1829,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + vmtobject.constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -1862,7 +1862,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit, ++ vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if vmtobject.object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2230,7 +2230,7 @@ + failed := false; + + Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...'); +- constructor_params_mixed_call_overriden(RESULT_U8BIT, ++ constructor_params_mixed_call_overridden(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2259,7 +2259,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- constructor_params_mixed_call_overriden(value_u8bit, ++ constructor_params_mixed_call_overridden(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2446,7 +2446,7 @@ + + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...'); +- method_virtual_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2476,7 +2476,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_overriden_params_mixed(value_u8bit, ++ method_virtual_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2665,10 +2665,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...'); +- method_normal_call_overriden_params_mixed(RESULT_U8BIT, ++ method_normal_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -2698,7 +2698,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_normal_call_overriden_params_mixed(value_u8bit, ++ method_normal_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3001,10 +3001,10 @@ + else + Writeln('Passed!'); + +- { The virtual method has been overriden by the object in this case } ++ { The virtual method has been overridden by the object in this case } + constructor_init; + Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...'); +- method_virtual_call_overriden_params_mixed(RESULT_U8BIT, ++ method_virtual_call_overridden_params_mixed(RESULT_U8BIT, + RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT); + if object_u8bit <> RESULT_U8BIT then + failed := true; +@@ -3034,7 +3034,7 @@ + value_bigstring := RESULT_BIGSTRING; + value_s32bit := RESULT_S32BIT; + value_s64bit := RESULT_S64BIT; +- method_virtual_call_overriden_params_mixed(value_u8bit, ++ method_virtual_call_overridden_params_mixed(value_u8bit, + value_u16bit, value_bigstring, value_s32bit, value_s64bit); + if object_u8bit <> RESULT_U8BIT then + failed := true; +Index: fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp (working copy) +@@ -1,5 +1,5 @@ + { %skiptarget=win32,win64,wince } +-{ This test is only usefull if the local codepage is utf-8 which ++{ This test is only useful if the local codepage is utf-8 which + usually not the case on windows + } + {$codepage utf-8} +Index: fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp (working copy) +@@ -2,7 +2,7 @@ + + { Old file: tbs0317.pp } + +-{ This shouldn't give a warning, because it can be used in an other program } ++{ This shouldn't give a warning, because it can be used in another program } + var + exportedc : longint;cvar;public; + begin +Index: fpcbuild-2.4.0/fpcsrc/tests/readme.txt +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/tests/readme.txt (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/tests/readme.txt (working copy) +@@ -102,7 +102,7 @@ + Calling "make full" will perform tests in a standard manner. To have + more control of the test process one must distinguish between: + +-* Driver enviroment: compiler/rtl etc. to be used by the tools which ++* Driver environment: compiler/rtl etc. to be used by the tools which + runs and analyze the tests. All normal options to make, like FPC + OS_TARGET, OPT etc. controls this. + +@@ -122,7 +122,7 @@ + TEST_FPC_VERSION defaults to version of TEST_FPC + TEST_CCOMPILER defaults to installed gcc compiler, but only + if driver and test full-targets are the same. +-TEST_VERBOSE let dotest be more verbose, only usefull for debugging ++TEST_VERBOSE let dotest be more verbose, only useful for debugging + TEST_DELTEMP delete temporary executable/object/ppu file, + default is off + TEST_TIMEOUT use timeout wrapper for (remote) execution +@@ -159,7 +159,7 @@ + TEST_DELTEMP delete executable after running, so the remote system + doesn't need much free disk space + TEST_REMOTEPW pass a password with -pw to remote tools, +- mainly usefull for putty ++ mainly useful for putty + + + Examples: +Index: fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc (working copy) +@@ -758,7 +758,7 @@ + '10007_U_PPU Invalid Header (no PPU at the begin)'#000+ + '10008_U_','PPU Invalid Version $1'#000+ + '10009_U_PPU is compiled for another processor'#000+ +- '10010_U_PPU is compiled for an other target'#000+ ++ '10010_U_PPU is compiled for another target'#000+ + '10011_U_PPU Source: $1'#000+ + '10012_U_Writing $1'#000+ + '10013_F_Can'#039't Write PPU-File'#000+ +Index: fpcbuild-2.4.0/fpcsrc/compiler/nld.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/nld.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/nld.pas (working copy) +@@ -639,7 +639,7 @@ + + { Optimize the reuse of the destination of the assingment in left. + Allow the use of the left inside the tree generated on the right. +- This is especially usefull for string routines where the destination ++ This is especially useful for string routines where the destination + is pushed as a parameter. Using the final destination of left directly + save a temp allocation and copy of data (PFV) } + oldassignmentnode:=aktassignmentnode; +Index: fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas (working copy) +@@ -669,7 +669,7 @@ + + procedure TDebugInfoDwarf.set_def_dwarf_labs(def:tdef); + begin +- { Keep track of used dwarf entries, this info is only usefull for dwarf entries ++ { Keep track of used dwarf entries, this info is only useful for dwarf entries + referenced by the symbols. Definitions will always include all + required stabs } + if def.dbg_state=dbg_state_unused then +Index: fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas (working copy) +@@ -41,7 +41,7 @@ + con_ref = 1; + con_const = 2; + { The contents aren't usable anymore for CSE, but they may still be } +- { usefull for detecting whether the result of a load is actually used } ++ { useful for detecting whether the result of a load is actually used } + con_invalid = 3; + { the reverse of the above (in case a (conditional) jump is encountered): } + { CSE is still possible, but the original instruction can't be removed } +Index: fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas (working copy) +@@ -47,7 +47,7 @@ + + { All the following routines currently + call compilerprocs, unless they are +- overriden in which case, the code ++ overridden in which case, the code + generator handles them. + } + function first_pi: tnode ; virtual; +Index: fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas (working copy) +@@ -1486,7 +1486,7 @@ + procedure ProcessDefIfStruct(definition: tdef); + begin + { still led to infinite recursions +- only usefull for unamed types PM } ++ only useful for unamed types PM } + if assigned(definition) and not assigned(definition.typesym) then + begin + case definition.typ of +Index: fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas (working copy) +@@ -1062,7 +1062,7 @@ + writeusedunit(true); + + { write the objectfiles and libraries that come for this unit, +- preserve the containers becuase they are still needed to load ++ preserve the containers because they are still needed to load + the link.res. + All doesn't depend on the crc! It doesn't matter + if a unit is in a .o or .a file } +@@ -1140,7 +1140,7 @@ + { write whole program optimisation-related information } + tunitwpoinfo(wpoinfo).ppuwrite(ppufile); + +- { the last entry ibend is written automaticly } ++ { the last entry ibend is written automatically } + + { flush to be sure } + ppufile.flush; +Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas (working copy) +@@ -21,7 +21,7 @@ + } + { @abstract(This unit implements an abstract asm output class for all processor types) + This unit implements an abstract assembler output class for all processors, these +- are then overriden for each assembler writer to actually write the data in these ++ are then overridden for each assembler writer to actually write the data in these + classes to an assembler file. + } + +Index: fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas (working copy) +@@ -67,7 +67,7 @@ + + {# This is the base class for writing instructions. + +- The WriteInstruction() method must be overriden ++ The WriteInstruction() method must be overridden + to write a single instruction to the assembler + file. + } +Index: fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas (working copy) +@@ -1526,7 +1526,7 @@ + { read all entries until the end and write them also to the new ppu } + repeat + b:=inppu.readentry; +- { don't write ibend, that's written automaticly } ++ { don't write ibend, that's written automatically } + if b<>ibend then + begin + if b=iblinkothersharedlibs then +Index: fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas (working copy) +@@ -1007,7 +1007,7 @@ + hpropsym : tpropertysym; + begin + result:=false; +- { find property in the overriden list } ++ { find property in the overridden list } + hpropsym:=propsym; + repeat + propaccesslist:=hpropsym.propaccesslist[pap]; +@@ -1016,7 +1016,7 @@ + result:=true; + exit; + end; +- hpropsym:=hpropsym.overridenpropsym; ++ hpropsym:=hpropsym.overriddenpropsym; + until not assigned(hpropsym); + end; + +Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas (working copy) +@@ -250,7 +250,7 @@ + propaccesslist:=hpropsym.propaccesslist[pap]; + if not propaccesslist.empty then + break; +- hpropsym:=hpropsym.overridenpropsym; ++ hpropsym:=hpropsym.overriddenpropsym; + until not assigned(hpropsym); + if not(assigned(propaccesslist) and assigned(propaccesslist.firstsym)) then + begin +Index: fpcbuild-2.4.0/fpcsrc/compiler/globals.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/globals.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/globals.pas (working copy) +@@ -1425,7 +1425,7 @@ + RelocSection:=false; + RelocSectionSetExplicitly:=false; + LinkTypeSetExplicitly:=false; +- { memory sizes, will be overriden by parameter or default for target ++ { memory sizes, will be overridden by parameter or default for target + in options or init_parser } + stacksize:=0; + { not initialized yet } +Index: fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas (working copy) +@@ -49,7 +49,7 @@ + {# @abstract(Abstract code generator) + This class implements an abstract instruction generator. Some of + the methods of this class are generic, while others must +- be overriden for all new processors which will be supported ++ be overridden for all new processors which will be supported + by Free Pascal. For 32-bit processors, the base class + sould be @link(tcg64f32) and not @var(tcg). + } +@@ -120,7 +120,7 @@ + + This routine should push/send the parameter to the routine, as + required by the specific processor ABI and routine modifiers. +- This must be overriden for each CPU target. ++ This must be overridden for each CPU target. + + @param(size size of the operand in the register) + @param(r register source of the operand) +@@ -130,7 +130,7 @@ + {# Pass a parameter, which is a constant, to a routine. + + A generic version is provided. This routine should +- be overriden for optimization purposes if the cpu ++ be overridden for optimization purposes if the cpu + permits directly sending this type of parameter. + + @param(size size of the operand in constant) +@@ -141,7 +141,7 @@ + {# Pass the value of a parameter, which is located in memory, to a routine. + + A generic version is provided. This routine should +- be overriden for optimization purposes if the cpu ++ be overridden for optimization purposes if the cpu + permits directly sending this type of parameter. + + @param(size size of the operand in constant) +@@ -164,7 +164,7 @@ + calculated address as a parameter. + + A generic version is provided. This routine should +- be overriden for optimization purposes if the cpu ++ be overridden for optimization purposes if the cpu + permits directly sending this type of parameter. + + @param(r reference to get address from) +@@ -190,7 +190,7 @@ + } + + {# Emits instruction to call the method specified by symbol name. +- This routine must be overriden for each new target cpu. ++ This routine must be overridden for each new target cpu. + + There is no a_call_ref because loading the reference will use + a temp register on most cpu's resulting in conflicts with the +@@ -199,7 +199,7 @@ + procedure a_call_name(list : TAsmList;const s : string; weak: boolean);virtual; abstract; + procedure a_call_reg(list : TAsmList;reg : tregister);virtual; abstract; + procedure a_call_ref(list : TAsmList;ref : treference);virtual; abstract; +- { same as a_call_name, might be overriden on certain architectures to emit ++ { same as a_call_name, might be overridden on certain architectures to emit + static calls without usage of a got trampoline } + procedure a_call_name_static(list : TAsmList;const s : string);virtual; + +@@ -382,7 +382,7 @@ + {# This should emit the opcode to copy len bytes from the source + to destination. + +- It must be overriden for each new target processor. ++ It must be overridden for each new target processor. + + @param(source Source reference of copy) + @param(dest Destination reference of copy) +@@ -392,7 +392,7 @@ + {# This should emit the opcode to copy len bytes from the an unaligned source + to destination. + +- It must be overriden for each new target processor. ++ It must be overridden for each new target processor. + + @param(source Source reference of copy) + @param(dest Destination reference of copy) +@@ -415,7 +415,7 @@ + procedure g_finalize(list : TAsmList;t : tdef;const ref : treference); + + {# Generates range checking code. It is to note +- that this routine does not need to be overriden, ++ that this routine does not need to be overridden, + as it takes care of everything. + + @param(p Node which contains the value to check) +@@ -432,7 +432,7 @@ + + {# Emits instructions when compilation is done in profile + mode (this is set as a command line option). The default +- behavior does nothing, should be overriden as required. ++ behavior does nothing, should be overridden as required. + } + procedure g_profilecode(list : TAsmList);virtual; + {# Emits instruction for allocating @var(size) bytes at the stackpointer +Index: fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas (working copy) +@@ -60,7 +60,7 @@ + procedure MakeObject;virtual;abstract; + end; + +- {# This is the base class which should be overriden for each each ++ {# This is the base class which should be overridden for each each + assembler writer. It is used to actually assembler a file, + and write the output to the assembler file. + } +@@ -115,11 +115,11 @@ + procedure AsmCreate(Aplace:tcutplace); + procedure AsmClose; + +- {# This routine should be overriden for each assembler, it is used ++ {# This routine should be overridden for each assembler, it is used + to actually write the abstract assembler stream to file.} + procedure WriteTree(p:TAsmList);virtual; + +- {# This routine should be overriden for each assembler, it is used ++ {# This routine should be overridden for each assembler, it is used + to actually write all the different abstract assembler streams + by calling for each stream type, the @var(WriteTree) method.} + procedure WriteAsmList;virtual; +Index: fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas (working copy) +@@ -120,7 +120,7 @@ + code generator to allocate and free registers which might be valid + across nodes. It also contains utility routines related to registers. + +- Some of the methods in this class should be overriden ++ Some of the methods in this class should be overridden + by cpu-specific implementations. + + --------------------------------------------------------------------} +@@ -160,7 +160,7 @@ + { default subregister used } + defaultsub : tsubregister; + live_registers:Tsuperregisterworklist; +- { can be overriden to add cpu specific interferences } ++ { can be overridden to add cpu specific interferences } + procedure add_cpu_interferences(p : tai);virtual; + procedure add_constraints(reg:Tregister);virtual; + function get_alias(n:Tsuperregister):Tsuperregister; +@@ -1947,7 +1947,7 @@ + exit; + + {$ifdef x86} +- { Try replacing the register with the spilltemp. This is usefull only ++ { Try replacing the register with the spilltemp. This is useful only + for the i386,x86_64 that support memory locations for several instructions } + for counter := 0 to pred(regindex) do + with regs[counter] do +Index: fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas (working copy) +@@ -651,7 +651,7 @@ + exit; + end; + end; +- { Set foundfile to something usefull } ++ { Set foundfile to something useful } + FoundFile:=fn; + end; + +Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas (working copy) +@@ -35,7 +35,7 @@ + floating point value in the floating point + register r. + +- This routine should be overriden, since ++ This routine should be overridden, since + the generic version is not optimal at all. The + generic version assumes that floating + point values are stored in the register +@@ -277,7 +277,7 @@ + procedure tcgmoddivnode.emit64_div_reg_reg(signed: boolean; denum,num:tregister64); + begin + { handled in pass_1 already, unless pass_1 is +- overriden ++ overridden + } + { should be handled in pass_1 (JM) } + internalerror(200109052); +Index: fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas (working copy) +@@ -1868,7 +1868,7 @@ + (tabstractvarsym(tloadnode(realassignmenttarget).symtableentry).varregable in [vr_none,vr_addr]) + ) then + begin +- { If the funcret is also used as a parameter we can't optimize becuase the funcret ++ { If the funcret is also used as a parameter we can't optimize because the funcret + and the parameter will point to the same address. That means that a change of the result variable + will result also in a change of the parameter value } + result:=not foreachnodestatic(left,@check_funcret_used_as_para,tloadnode(realassignmenttarget).symtableentry); +@@ -2074,7 +2074,7 @@ + end; + { now all parents are in the correct order + insert all abstract methods in the list, and remove +- those which are overriden by parent classes. ++ those which are overridden by parent classes. + } + objectinfo:=tobjectinfoitem(parents.first); + while assigned(objectinfo) do +Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas (working copy) +@@ -21,7 +21,7 @@ + } + { @abstract(This unit implements an abstract asm output class for all processor types) + This unit implements an abstract assembler output class for all processors, these +- are then overriden for each assembler writer to actually write the data in these ++ are then overridden for each assembler writer to actually write the data in these + classes to an assembler file. + } + +@@ -2111,7 +2111,7 @@ + + function tai_cpu_abstract.is_same_reg_move(regtype: Tregistertype):boolean; + begin +- { When the generic RA is used this needs to be overriden, we don't use ++ { When the generic RA is used this needs to be overridden, we don't use + virtual;abstract; to prevent a lot of warnings of unimplemented abstract methods + when tai_cpu is created (PFV) } + internalerror(200404091); +Index: fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas (working copy) +@@ -1205,7 +1205,7 @@ + exit; + end; + +- { check also parasymtable, this needs to be done here becuase ++ { check also parasymtable, this needs to be done here because + of the special situation with the funcret sym that needs to be + hidden for tp and delphi modes } + hsym:=tsym(tabstractprocdef(defowner).parast.FindWithHash(hashedid)); +Index: fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas (working copy) +@@ -220,8 +220,8 @@ + + tpropertysym = class(Tstoredsym) + propoptions : tpropertyoptions; +- overridenpropsym : tpropertysym; +- overridenpropsymderef : tderef; ++ overriddenpropsym : tpropertysym; ++ overriddenpropsymderef : tderef; + propdef : tdef; + propdefderef : tderef; + indexdef : tdef; +@@ -786,7 +786,7 @@ + begin + inherited ppuload(propertysym,ppufile); + ppufile.getsmallset(propoptions); +- ppufile.getderef(overridenpropsymderef); ++ ppufile.getderef(overriddenpropsymderef); + ppufile.getderef(propdefderef); + index:=ppufile.getlongint; + default:=ppufile.getlongint; +@@ -810,7 +810,7 @@ + var + pap : tpropaccesslisttypes; + begin +- overridenpropsymderef.build(overridenpropsym); ++ overriddenpropsymderef.build(overriddenpropsym); + propdefderef.build(propdef); + indexdefderef.build(indexdef); + for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do +@@ -822,7 +822,7 @@ + var + pap : tpropaccesslisttypes; + begin +- overridenpropsym:=tpropertysym(overridenpropsymderef.resolve); ++ overriddenpropsym:=tpropertysym(overriddenpropsymderef.resolve); + indexdef:=tdef(indexdefderef.resolve); + propdef:=tdef(propdefderef.resolve); + for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do +@@ -842,7 +842,7 @@ + begin + inherited ppuwrite(ppufile); + ppufile.putsmallset(propoptions); +- ppufile.putderef(overridenpropsymderef); ++ ppufile.putderef(overriddenpropsymderef); + ppufile.putderef(propdefderef); + ppufile.putlongint(index); + ppufile.putlongint(default); +Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas (working copy) +@@ -1405,7 +1405,7 @@ + + { Here, we return the function result. In most architectures, the value is + passed into the FUNCTION_RETURN_REG, but in a windowed architecure like sparc a +- function returns in a register and the caller receives it in an other one } ++ function returns in a register and the caller receives it in another one } + case funcretloc.loc of + LOC_REGISTER: + begin +@@ -2379,7 +2379,7 @@ + LOC_REFERENCE instead for all none register variables. This is + required because we can't store an asmsymbol in the localloc because + the asmsymbol is invalid after an unit is compiled. This gives +- problems when this procedure is inlined in an other unit (PFV) } ++ problems when this procedure is inlined in another unit (PFV) } + if vs.is_regvar(false) then + begin + vs.initialloc.loc:=tvarregable2tcgloc[vs.varregable]; +Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas (working copy) +@@ -246,7 +246,7 @@ + ait_instruction : + begin + { remove cached insentry, because the new code can +- require an other less optimized instruction } ++ require another less optimized instruction } + {$ifdef i386} + {$ifndef NOAG386BIN} + taicpu(hp2).ResetPass1; +@@ -291,7 +291,7 @@ + ait_instruction : + begin + { remove cached insentry, because the new code can +- require an other less optimized instruction } ++ require another less optimized instruction } + {$ifdef i386} + {$ifndef NOAG386BIN} + taicpu(hp).ResetPass1; +Index: fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc (working copy) +@@ -173,7 +173,7 @@ + endif + endif + +-# set correct defines (-d$(CPU_TARGET) is automaticly added in makefile.fpc) ++# set correct defines (-d$(CPU_TARGET) is automatically added in makefile.fpc) + override LOCALOPT+=-d$(CPC_TARGET) -dGDB -dBROWSERLOG + + # i386 specific +Index: fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas (working copy) +@@ -423,7 +423,7 @@ + begin + While not SharedLibFiles.Empty do + begin +- {becuase of upper/lower case mix, we may get duplicate ++ {because of upper/lower case mix, we may get duplicate + names but nlmconv ignores that. + Here we are setting the import-files for nlmconv. I.e. for + the module libc or libc.nlm we add IMPORT @libc.imp and also +Index: fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas (working copy) +@@ -405,7 +405,7 @@ + begin + While not SharedLibFiles.Empty do + begin +- {becuase of upper/lower case mix, we may get duplicate ++ {because of upper/lower case mix, we may get duplicate + names but nlmconv ignores that. + Here we are setting the import-files for nlmconv. I.e. for + the module clib or clib.nlm we add IMPORT @clib.imp and also +Index: fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas (working copy) +@@ -36,7 +36,7 @@ + + type + {# This class defines some methods to take care of routine +- parameters. It should be overriden for each new processor ++ parameters. It should be overridden for each new processor + } + tparamanager = class + { true if the location in paraloc can be reused as localloc } +Index: fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas (working copy) +@@ -1561,7 +1561,7 @@ + case oper.opr.typ of + OPR_LOCAL : + begin +- { don't allow direct access to fields of parameters, becuase that ++ { don't allow direct access to fields of parameters, because that + will generate buggy code. Allow it only for explicit typecasting + and when the parameter is in a register (delphi compatible) } + if (not oper.hastype) and +Index: fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas (working copy) +@@ -2213,7 +2213,7 @@ + begin + { these are dissambler hints or 32 bit prefixes which + are not needed +- It's usefull to write rex :) (FK) } ++ It's useful to write rex :) (FK) } + {$ifdef x86_64} + maybewriterex; + {$endif x86_64} +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg (working copy) +@@ -829,7 +829,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_השימוש במ×סף הנוכחי ×ינו תומך בוסג התוצ××” הבינ×רית + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_×סור ×œ×§×¨×•× ×œ×™×—×™×“×ª OBJPAS ישירות, יש להשתמש ב \{\$mode objfpc\} ×ו ב \{\$mode delphi\} ×‘×ž×§×•× + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1336,7 +1336,7 @@ + type_w_instance_with_abstract=04046_W_מ×תחל ×ת המחלקה "$1" ×¢× ×ž×ª×•×“×•×ª ×œ× ×ž×ž×•×ž×©×•×ª + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_הערך השמ×לי של ×”×ופרנד IN צריך להיות בגודל של בית + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg (working copy) +@@ -1396,7 +1396,7 @@ + type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2" + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Gr”sse haben + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8 bits. This may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg (working copy) +@@ -791,7 +791,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedostêpne gdy wyj¶ciowym formatem jest wbudowane zapisywanie binarne + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Nie ³aduj modu³u OBJPAS bezpo¶rednio - u¿yj trybu obiektowego (objfpc, delphi) + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1200,7 +1200,7 @@ + type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj±cej metody abstrakcyjne + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Lewy operand operatora IN powinien byæ wielko¶ci jednego bajta + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg (working copy) +@@ -574,7 +574,7 @@ + % Fields that are declared in a \var{private} section of an object or class + % declaration cannot be accessed outside the module where the class is + % defined. +-parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overriden by "$1" which has another return type ++parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overridden by "$1" which has another return type + % If you declare overridden methods in a class definition, they must + % have the same return type. + parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested +@@ -1391,7 +1391,7 @@ + type_w_instance_with_abstract=04046_W_Constructing a class "$1" with abstract method "$2" + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_The left operand of the IN operator should be byte sized + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8 bits. This may lead to range check errors. The \var{in} operator +@@ -2256,7 +2256,7 @@ + unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor + % This unit file was compiled for a different processor type, and + % cannot be read. +-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target ++unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target + % This unit file was compiled for a different target, and + % cannot be read. + unit_u_ppu_source=10011_U_PPU Source: $1 +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg (working copy) +@@ -811,7 +811,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Direkte assembler er ikke understøttet i det binære udformat + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Inkludér ikke unit'en OBJPAS manuelt, brug i stedet {$mode objfpc} eller {$mode delphi} + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1245,7 +1245,7 @@ + type_w_instance_with_abstract=04046_W_Konstruerer klassen "$1" med abstrakte metoder + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Den venstre operand til IN-operatoren skal være én byte stor + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg (working copy) +@@ -814,11 +814,11 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non support‚ pour la sortie binaire + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unit‚ OBJPAS manuellement, utilisez {$mode objfpc} ou {$mode delphi} + % You're trying to load the ObjPas unit manual from a uses clause. This is + % not a good idea to do, you can better use the {$mode objfpc} or {$mode delphi} +-% directives which load the unit automaticly ++% directives which load the unit automatically + parser_e_no_object_override=03150_E_OVERRIDE nepeut ˆtre utilis‚ pour des objets + % Override isn't support for objects, use VIRTUAL instead to override + % a method of an anchestor object +@@ -1548,10 +1548,10 @@ + unit_u_ppu_invalid_version=10008_U_PPU Invalid Version $1 + % This unit file was compiled with a different version of the compiler, and + % cannot be read. +-unit_u_ppu_invalid_processor=10009_U_PPU is compiled for an other processor ++unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor + % This unit file was compiled for a different processor type, and + % cannot be read +-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target ++unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target + % This unit file was compiled for a different processor type, and + % cannot be read + unit_u_ppu_source=10011_U_PPU Source: $1 +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg (working copy) +@@ -530,7 +530,7 @@ + % overridden in the descendent class with the \var{override} directive. If you + % don't specify the \var{override} directive, you will hide the parent method; + % you will not override it. +-parser_e_nothing_to_be_overridden=03058_E_Nao ha metodo em classe ancestral com este nome para sofrer overriden : "$1" ++parser_e_nothing_to_be_overridden=03058_E_Nao ha metodo em classe ancestral com este nome para sofrer overridden : "$1" + % You are trying to \var{override} a virtual method of a parent class that does + % not exist. + parser_e_no_procedure_to_access_property=03059_E_Faltou a clausula "read" na declaracao da propriedade +@@ -818,7 +818,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_"Direct assembly" nao e suportado quando usando formato binario de saida + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Nao carregue OBJPAS unit com "uses", use \{\$mode objfpc\} ou \{\$mode delphi\} ao inves disto + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1240,7 +1240,7 @@ + type_w_instance_with_abstract=04046_W_Construindo classe "$1" mas superclasse tem metodos virtuais que nao sofreram override + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Operando a esquerada de um operador IN tem que ter tamanho de 1 byte + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg (working copy) +@@ -830,12 +830,12 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Ïðÿìîé ñòèëü àññåìáëåpà íå ïîääåpæèâàåòñÿ ôîpìàòîì âûõîäíîãî ôàéëà + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Hå çàãpyæàéòå OBJPAS ìîäyëü, èñïîëüçyéòå {$mode objfpc} èëè {$mode delphi} âìåñòî ýòîãî + % You're trying to load the ObjPas unit manual from a uses clause. This is + % not a good idea to do, you can better use the \var{\{\$mode objfpc\}} or + % \var{\{\$mode delphi\}} +-% directives which load the unit automaticly ++% directives which load the unit automatically + parser_e_no_object_override=03150_E_Ïåpåîïpåäåëåíèå íå ìîæåò áûòü èñïîëüçîâàííî â îáúåêòàõ + % Override isn't support for objects, use VIRTUAL instead to override + % a method of an anchestor object +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg (working copy) +@@ -829,7 +829,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_äùéîåù áîàñó äðåëçé àéðå úåîê áåñâ äúåöàä äáéðàøéú + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_àñåø ì÷øåà ìéçéãú OBJPAS éùéøåú, éù ìäùúîù á \{\$mode objfpc\} àå á \{\$mode delphi\} áî÷åí + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1336,7 +1336,7 @@ + type_w_instance_with_abstract=04046_W_îàúçì àú äîçì÷ä "$1" òí îúåãåú ìà îîåîùåú + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_äòøê äùîàìé ùì äàåôøðã IN öøéê ìäéåú áâåãì ùì áéú + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg (working copy) +@@ -782,7 +782,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\} + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1189,7 +1189,7 @@ + type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene métodos abstractos + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tamaño un byte + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg (working copy) +@@ -815,7 +815,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Directe assemblercode wordt niet ondersteund door de interne assembler. + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Laad de OBJPAS unit niet manueel, gebruik {$mode objfpc} of {$mode delphi}. + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1243,7 +1243,7 @@ + type_w_instance_with_abstract=04046_W_Constructie van een klasse "$1" met abstracte methoden + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_De linker operand van de IN operator moet de grootte van een byte hebben + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg (working copy) +@@ -816,7 +816,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non supporté pour la sortie binaire + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unité OBJPAS manuellement, utilisez de préférence \{\$mode Objfpc\} ou \{\$mode Delphi\} + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1270,7 +1270,7 @@ + type_w_instance_with_abstract=04046_W_Construction d´une classe "$1" avec des méthodes abstraites + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=L´opérande à gauche de l´opérateur IN doit avoir la longueur d´un octet (8 bits) + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg (working copy) +@@ -830,12 +830,12 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_àאַ© áâ¨«ì  áᥬ¡«¥p  ­¥ ¯®¤¤¥p¦¨¢ ¥âáï ä®p¬ â®¬ ¢ë室­®£® ä ©«  + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_H¥ § £py¦ ©â¥ OBJPAS ¬®¤y«ì, ¨á¯®«ì§y©â¥ {$mode objfpc} ¨«¨ {$mode delphi} ¢¬¥áâ® í⮣® + % You're trying to load the ObjPas unit manual from a uses clause. This is + % not a good idea to do, you can better use the \var{\{\$mode objfpc\}} or + % \var{\{\$mode delphi\}} +-% directives which load the unit automaticly ++% directives which load the unit automatically + parser_e_no_object_override=03150_E_¥p¥®¯p¥¤¥«¥­¨¥ ­¥ ¬®¦¥â ¡ëâì ¨á¯®«ì§®¢ ­­® ¢ ®¡ê¥ªâ å + % Override isn't support for objects, use VIRTUAL instead to override + % a method of an anchestor object +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg (working copy) +@@ -521,7 +521,7 @@ + % declaration cannot be accessed outside the module where the class is + % defined. + parser_e_overridden_methods_not_same_ret=03066_E_Els mètodes sobrecarregats han de retornar el mateix tipus: "$2" està sobrecarregat per "$1", el qual retorna un altre tipus +-% If you declare overriden methods in a class definition, they must ++% If you declare overridden methods in a class definition, they must + % have the same return type. + parser_e_dont_nest_export=03067_E_Les funcions declarades amb EXPORT no poden estar niades + % You cannot declare a function or procedure within a function or procedure +@@ -784,7 +784,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_L'assemblador directe no és compatible amb el format binari de la sortida + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + % \end{description} + parser_w_no_objpas_use_mode=03149_W_No carregueu manualment l'unitat OBJPAS, utilitzeu {\$mode objfpc\} o {\$mode delphi\} + % You are trying to load the ObjPas unit manual from a uses clause. This is +@@ -1192,7 +1192,7 @@ + type_w_instance_with_abstract=04046_W_S'està construint una classe "$1" amb mètodes abstractes + % An instance of a class is created which contains non_implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_L'operand esquerra per a l'operador d'IN ha de tenir el tamany d'un octet + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg (working copy) +@@ -788,7 +788,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\} + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1195,7 +1195,7 @@ + type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene métodos abstractos + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tamaño un byte + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg (working copy) +@@ -1396,7 +1396,7 @@ + type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2" + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Grösse haben + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8 bits. This may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg (working copy) +@@ -530,7 +530,7 @@ + % overridden in the descendent class with the \var{override} directive. If you + % don't specify the \var{override} directive, you will hide the parent method; + % you will not override it. +-parser_e_nothing_to_be_overridden=03058_E_Não há método em classe ancestral com este nome para sofrer overriden : "$1" ++parser_e_nothing_to_be_overridden=03058_E_Não há método em classe ancestral com este nome para sofrer overridden : "$1" + % You are trying to \var{override} a virtual method of a parent class that does + % not exist. + parser_e_no_procedure_to_access_property=03059_E_Faltou a cláusula "read" na declaração da propriedade +@@ -818,7 +818,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_"Direct assembly" não é suportado quando usando formato binário de saída + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Não carregue OBJPAS unit com "uses", use \{\$mode objfpc\} ou \{\$mode delphi\} ao invés disto + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1240,7 +1240,7 @@ + type_w_instance_with_abstract=04046_W_Construindo classe "$1" mas superclasse tem métodos virtuais que não sofreram override + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Operando a esquerada de um operador IN tem que ter tamanho de 1 byte + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg (working copy) +@@ -791,7 +791,7 @@ + % are stored on the stack + parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedost©pne gdy wyj˜ciowym formatem jest wbudowane zapisywanie binarne + % You can't use direct assembler when using a binary writer, choose an +-% other outputformat or use an other assembler reader ++% other outputformat or use another assembler reader + parser_w_no_objpas_use_mode=03149_W_Nie ˆaduj moduˆu OBJPAS bezpo˜rednio - u¾yj trybu obiektowego (objfpc, delphi) + % You are trying to load the ObjPas unit manually from a uses clause. This is + % not a good idea. Use the \var{\{\$mode objfpc\}} or +@@ -1200,7 +1200,7 @@ + type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj¥cej metody abstrakcyjne + % An instance of a class is created which contains non-implemented abstract + % methods. This will probably lead to a runtime error 211 in the code if that +-% routine is ever called. All abstract methods should be overriden. ++% routine is ever called. All abstract methods should be overridden. + type_h_in_range_check=04047_H_Lewy operand operatora IN powinien by† wielko˜ci jednego bajta + % The left operand of the \var{in} operator is not an ordinal or enumeration which fits + % within 8-bits, this may lead to range check errors. The \var{in} operator +Index: fpcbuild-2.4.0/fpcsrc/compiler/psub.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/psub.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/psub.pas (working copy) +@@ -1547,7 +1547,7 @@ + old_current_objectdef:=current_objectdef; + + { reset current_procinfo.procdef to nil to be sure that nothing is writing +- to an other procdef } ++ to another procdef } + current_procinfo:=nil; + current_objectdef:=nil; + +Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas (working copy) +@@ -21,7 +21,7 @@ + } + { @abstract(This unit implements an abstract asm output class for all processor types) + This unit implements an abstract assembler output class for all processors, these +- are then overriden for each assembler writer to actually write the data in these ++ are then overridden for each assembler writer to actually write the data in these + classes to an assembler file. + } + +Index: fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp (working copy) +@@ -385,7 +385,7 @@ + { read all entries until the end and write them also to the new ppu } + repeat + b:=inppu.readentry; +- { don't write ibend, that's written automaticly } ++ { don't write ibend, that's written automatically } + if b<>ibend then + begin + if b=iblinkothersharedlibs then +Index: fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas (working copy) +@@ -242,7 +242,7 @@ + sym : tsym; + srsymtable: tsymtable; + p : tpropertysym; +- overriden : tsym; ++ overridden : tsym; + varspez : tvarspez; + hdef : tdef; + arraytype : tdef; +@@ -351,7 +351,7 @@ + if paranr>0 then + include(p.propoptions,ppo_hasparameters); + end; +- { overriden property ? } ++ { overridden property ? } + { force property interface + there is a property parameter + a global property } +@@ -398,18 +398,18 @@ + else + begin + { do an property override } +- overriden:=search_class_member(aclass.childof,p.name); +- if assigned(overriden) and +- (overriden.typ=propertysym) and ++ overridden:=search_class_member(aclass.childof,p.name); ++ if assigned(overridden) and ++ (overridden.typ=propertysym) and + not(is_dispinterface(aclass)) then + begin +- p.overridenpropsym:=tpropertysym(overriden); ++ p.overriddenpropsym:=tpropertysym(overridden); + { inherit all type related entries } +- p.indexdef:=tpropertysym(overriden).indexdef; +- p.propdef:=tpropertysym(overriden).propdef; +- p.index:=tpropertysym(overriden).index; +- p.default:=tpropertysym(overriden).default; +- p.propoptions:=tpropertysym(overriden).propoptions; ++ p.indexdef:=tpropertysym(overridden).indexdef; ++ p.propdef:=tpropertysym(overridden).propdef; ++ p.index:=tpropertysym(overridden).index; ++ p.default:=tpropertysym(overridden).default; ++ p.propoptions:=tpropertysym(overridden).propoptions; + end + else + begin +@@ -535,8 +535,8 @@ + + if assigned(aclass) and not(is_dispinterface(aclass)) then + begin +- { ppo_stored is default on for not overriden properties } +- if not assigned(p.overridenpropsym) then ++ { ppo_stored is default on for not overridden properties } ++ if not assigned(p.overriddenpropsym) then + include(p.propoptions,ppo_stored); + if try_to_consume(_STORED) then + begin +Index: fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas (working copy) +@@ -288,7 +288,7 @@ + not(def.dbg_state in [dbg_state_writing,dbg_state_written,dbg_state_queued]) then + internalerror(200403091); + +- { Keep track of used stabs, this info is only usefull for stabs ++ { Keep track of used stabs, this info is only useful for stabs + referenced by the symbols. Definitions will always include all + required stabs } + if def.dbg_state=dbg_state_unused then +@@ -509,7 +509,7 @@ + st:=def_stabstr_evaluate(def,'"'+symname+':$1$2=',[stabchar,def_stab_number(def)]); + end; + st:=st+ss; +- { line info is set to 0 for all defs, because the def can be in an other ++ { line info is set to 0 for all defs, because the def can be in another + unit and then the linenumber is invalid in the current sourcefile } + st:=st+def_stabstr_evaluate(def,'",${N_LSYM},0,0,0',[]); + { add to list } +Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas (working copy) +@@ -66,7 +66,7 @@ + type + // TODO STUBS see CmdTree.h (cmdtree.idl) + IFilter = Pointer; +- IUnkown = Pointer; ++ IUnknown = Pointer; + ICommand = Pointer; + {$IFNDEF JWA_INCLUDEMODE} + PPWCHAR = ^PWCHAR; +@@ -115,7 +115,7 @@ + function BindIFilterFromStorage(pStg: IStorage; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall; + {$EXTERNALSYM BindIFilterFromStorage} + +-function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnkown; out ppIUnk: IFilter): HRESULT; stdcall; ++function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall; + {$EXTERNALSYM BindIFilterFromStream} + + function LocateCatalogsW(pwszScope: PWCHAR; iBmk: ULONG; pwszMachine: PWCHAR; +Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas (working copy) +@@ -90,7 +90,7 @@ + // Simple DLL loading class. The idea is to use it to dynamically load + // a DLL at run-time using the GetProcedure method. Another (better) use is to derive a + // new class for each DLL you are interested in and explicitly call GetProcedure for +-// each function in an overriden Load method. You would then add procedure/function ++// each function in an overridden Load method. You would then add procedure/function + // aliases to the new class that maps down to the internally managed function pointers. + // This class is built from an idea I read about in Delphi Magazine a while ago but + // I forget who was the originator. If you know, let me know and I'll put it in the credits +@@ -384,7 +384,7 @@ + + procedure TModuleLoader.Error(ErrorCode: Cardinal); + begin +- // overriden classes should handle this ++ // overridden classes should handle this + end; + + function TModuleLoader.GetExportedSymbol(const AName: string; var Buffer; +Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas (working copy) +@@ -584,7 +584,7 @@ + // if ( pbtdi->fAuthenticated || pbtdi->fRemembered ) + // { + // // +-// // TODO: Do something usefull with the device info ++// // TODO: Do something useful with the device info + // // + // } + // +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp (working copy) +@@ -62,7 +62,7 @@ + function FormButton (aname, caption, aOnClick: DOMstring) : THTML_Input; + function FormHidden (aname, aValue: DOMstring) : THTML_Input; + function FormFile (aname, aValue:DOMstring) : THTML_Input; +- { Other usefull links to elements } ++ { Other useful links to elements } + function Meta (aname, ahtpequiv,acontent: DOMString) : THTML_meta; + function Link (arel, ahref, athetype, amedia: DOMString) : THTML_link; + function Script (s, athetype, asrc: DOMString) : THTML_script; +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp (working copy) +@@ -65,7 +65,7 @@ + YPelsPerMeter:Longint; + {46+04 : Number of colors used} + ClrUsed:longint; +-{50+04 : Number of imprtant colors used : usefull for displaying on VGA256} ++{50+04 : Number of imprtant colors used : useful for displaying on VGA256} + ClrImportant:longint; + end; + PBitMapInfoHeader = ^TBitMapInfoHeader; +Index: fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc (working copy) +@@ -114,7 +114,7 @@ + + {$ifndef NO_OTHER_CHILD} + { +- * register an other_child -- a child which the main loop keeps track of ++ * register another_child -- a child which the main loop keeps track of + * and knows it is different than the rest of the scoreboard. + * + * pid is the pid of the child. +@@ -149,7 +149,7 @@ + * us knowing ... buggy os? } + + { +- * unregister an other_child. Note that the data pointer is used here, and ++ * unregister another_child. Note that the data pointer is used here, and + * is assumed to be unique' per other_child. This is because the pid and + * write_fd are possibly killed off separately. + } +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp (working copy) +@@ -696,7 +696,7 @@ + begin + x := FieldBinding[FieldDef.FieldNo-1]; + +- // Joost, 5 jan 2006: I disabled the following, since it's usefull for ++ // Joost, 5 jan 2006: I disabled the following, since it's useful for + // debugging, but it also slows things down. In principle things can only go + // wrong when FieldDefs is changed while the dataset is opened. A user just + // shoudn't do that. ;) (The same is done in IBConnection) +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas (working copy) +@@ -1172,8 +1172,8 @@ + ODBCCheckResult( + SQLStatistics( + StmtHandle, +- nil, 0, // catalog unkown; request for all catalogs +- nil, 0, // schema unkown; request for all schemas ++ nil, 0, // catalog unknown; request for all catalogs ++ nil, 0, // schema unknown; request for all schemas + PChar(TableName), Length(TableName), // request information for TableName + SQL_INDEX_ALL, + SQL_QUICK +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp (working copy) +@@ -867,7 +867,7 @@ + {$R-} + x := FieldBinding[FieldDef.FieldNo-1]; + +- // Joost, 5 jan 2006: I disabled the following, since it's usefull for ++ // Joost, 5 jan 2006: I disabled the following, since it's useful for + // debugging, but it also slows things down. In principle things can only go + // wrong when FieldDefs is changed while the dataset is opened. A user just + // shoudn't do that. ;) (The same is done in PQConnection) +Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp (working copy) +@@ -104,12 +104,12 @@ + + procedure TEZcgi.DoPost; + begin +- // Must be overriden by child class ++ // Must be overridden by child class + end; + + procedure TEZcgi.DoGet; + begin +- // Must be overriden by child class ++ // Must be overridden by child class + end; + + procedure TEZcgi.WriteContent(ctype : String); +Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc (working copy) +@@ -144,7 +144,7 @@ + apr_os_file_t: Integer; {< native file } + typedef DIR apr_os_dir_t; {< native dir } + apr_os_sock_t: Integer; {< native dir } +-typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; {< native proces ++typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; {< native process + * mutex + } + {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)} +Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc (working copy) +@@ -679,7 +679,7 @@ + // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4; + + { +- * Register an other_child -- a child associated to its registered ++ * Register another_child -- a child associated to its registered + * maintence callback. This callback is invoked when the process + * dies, is disconnected or disappears. + * @param proc The child process to register. +Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc +=================================================================== +--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc (revision 14817) ++++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc (working copy) +@@ -88,7 +88,7 @@ + * 
+  * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
+  * ---------------------------------
+- * |   |   |   |   |   |   |   | x |  General debug code enabled (usefull in
++ * |   |   |   |   |   |   |   | x |  General debug code enabled (useful in
+  *                                    combination with --with-efence).
+  *
+  * |   |   |   |   |   |   | x |   |  Verbose output on stderr (report
+Index: fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp	(working copy)
+@@ -18,7 +18,7 @@
+   tDevice_name = String[Device_name_length];
+   tUser_name = String[User_name_length];
+   tHost_name = String[Host_name_length];
+-  tLogin_type = (Unkown, Run_level, Boot_time, New_time, Old_time,
++  tLogin_type = (Unknown, Run_level, Boot_time, New_time, Old_time,
+     Init_process, Login_process, User_process, Dead_process);
+   tLogin_types = set of tLogin_type;
+   tParameter_type = (Include, Exclude);
+@@ -38,9 +38,9 @@
+ Const
+   DefaultLoginType : TLogin_Types = [User_Process];
+   Login_type_names : array [TLogin_type] of string[20] =
+-  ('Unkown', 'Run level', 'Boot time','New time', 'Old time',
++  ('Unknown', 'Run level', 'Boot time','New time', 'Old time',
+     'Init process', 'Login process', 'User process', 'Dead process');
+- All_Login_types : TLogin_types = [Unkown, Run_level, Boot_time, New_time, Old_time,
++ All_Login_types : TLogin_types = [Unknown, Run_level, Boot_time, New_time, Old_time,
+     Init_process, Login_process, User_process, Dead_process];
+ 
+ procedure Read_logged_users;
+Index: fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas	(working copy)
+@@ -258,7 +258,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
++        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
+       end;
+       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
+       4:
+@@ -268,7 +268,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
++        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
+       end;
+     end;
+   end;
+@@ -684,7 +684,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
++        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
+       end;
+       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
+       4:
+@@ -694,7 +694,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
++        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
+       end;
+     end;
+   end;
+Index: fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas	(working copy)
+@@ -368,7 +368,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
++        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
+       end;
+       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
+       4:
+@@ -378,7 +378,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
++        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
+       end;
+     end;
+   end;
+@@ -866,7 +866,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
++        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
+       end;
+       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
+       4:
+@@ -876,7 +876,7 @@
+           writeln(f: 10)
+         else
+           writeln;
+-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
++        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
+       end;
+     end;
+   end;
+Index: fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc	(working copy)
+@@ -144,7 +144,7 @@
+   apr_os_file_t: Integer;        {< native file }
+ typedef DIR                   apr_os_dir_t;         {< native dir }
+   apr_os_sock_t: Integer;        {< native dir }
+-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native proces
++typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native process
+                                                           *   mutex
+                                                           }
+ {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)}
+Index: fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc	(working copy)
+@@ -716,7 +716,7 @@
+ // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4;
+ 
+ {
+- * Register an other_child -- a child associated to its registered 
++ * Register another_child -- a child associated to its registered 
+  * maintence callback.  This callback is invoked when the process
+  * dies, is disconnected or disappears.
+  * @param proc The child process to register.
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas	(working copy)
+@@ -459,7 +459,7 @@
+  *  
+  *  Discussion:
+  *    Returns a CFArrayRef containing CFDictionary objects containing
+- *    information about processses running on a remote machine.  If the
++ *    information about processes running on a remote machine.  If the
+  *    result array is NULL, the query failed and the error out
+  *    parameter will contain information about the failure.  If the
+  *    resolver had not been previously scheduled for execution, this
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas	(working copy)
+@@ -916,7 +916,7 @@
+     @constant       kAudioHardwarePropertyPlugInForBundleID
+                         Using an AudioValueTranslation structure, this property translates the input
+                         CFString containing a bundle ID into the AudioObjectID of the AudioPlugIn
+-                        that corresponds to it. This property will return kAudioObjectUnkown if the
++                        that corresponds to it. This property will return kAudioObjectUnknown if the
+                         given bundle ID doesn't match any AudioPlugIns.
+ }
+ const
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas	(working copy)
+@@ -3236,7 +3236,7 @@
+  *  
+  *  Discussion:
+  *    Advances the focus to the next most appropriate control. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+@@ -3273,7 +3273,7 @@
+  *  
+  *  Discussion:
+  *    Reverses the focus to the next most appropriate control. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas	(working copy)
+@@ -869,7 +869,7 @@
+  }
+ function DriverInstallReserveMem(drvrPtr: DRVRHeaderPtr; refNum: SInt16): OSErr; external name '_DriverInstallReserveMem';
+ {
+-  Note: DrvrInstall() is no longer supported, becuase it never really worked anyways.
++  Note: DrvrInstall() is no longer supported, because it never really worked anyways.
+         There will soon be a DriverInstall() which does the right thing.
+ 
+         DrvrRemove has been renamed to DriverRemove.  But, InterfaceLib for PowerPC
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas	(working copy)
+@@ -183,7 +183,7 @@
+ 
+ { Set the next image in the image destination `idst' to be the image at
+  * `index' in the image source `isrc'.  The index is zero-based. The
+- * properties of the source image can be added to or overriden by supplying
++ * properties of the source image can be added to or overridden by supplying
+  * additional keys/values in `properties'.  If a key in `properties' has
+  * the value kCFNull, the corresponding property in the destination will be
+  * removed. }
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas	(working copy)
+@@ -305,7 +305,7 @@
+ 		The reason for passing in this flag is to provide correct audit trail information and to avoid unnecessary user interaction.
+ 
+     @param rights (input/optional) An AuthorizationItemSet containing rights for which authorization is being requested.  If none are specified the resulting AuthorizationRef will authorize nothing at all.
+-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
++    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
+     @param authorization (output optional) A pointer to an AuthorizationRef to be returned.  When the returned AuthorizationRef is no longer needed AuthorizationFree should be called to prevent anyone from using the aquired rights.  If NULL is specified no new rights are returned, but the system will attempt to authorize all the requested rights and return the appropriate status.
+ 
+@@ -359,7 +359,7 @@
+ 
+     @param authorization (input) The authorization object on which this operation is performed.
+     @param rights (input) A rights set (see AuthorizationCreate).
+-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
++    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
+     @param authorizedRights (output/optional) A pointer to a newly allocated AuthorizationInfoSet in which the authorized subset of rights are returned (authorizedRights should be deallocated by calling AuthorizationFreeItemSet() when it is no longer needed).  If NULL the only information returned is the status.  Note that if the kAuthorizationFlagPreAuthorize flag was specified rights that could not be preauthorized are returned in authorizedRights, but their flags contains the kAuthorizationFlagCanNotPreAuthorize bit.
+ 
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas	(working copy)
+@@ -525,7 +525,7 @@
+ 	kPassThrough				= $00010000;
+ 	kNoSoundComponentChain		= $00020000;
+ 
+-	{ SoundParamBlock flags, usefull for OpenMixerSoundComponent }
++	{ SoundParamBlock flags, useful for OpenMixerSoundComponent }
+ 	kNoMixing					= $01;							{ don't mix source }
+ 	kNoSampleRateConversion		= $02;							{ don't convert sample rate (i.e. 11 kHz -> 22 kHz) }
+ 	kNoSampleSizeConversion		= $04;							{ don't convert sample size (i.e. 16 -> 8) }
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas	(working copy)
+@@ -431,7 +431,7 @@
+ { are not legal URL characters (based on RFC 2396), plus any characters }
+ { in legalURLCharactersToBeEscaped, less any characters in }
+ { charactersToLeaveUnescaped.  To simply correct any non-URL characters }
+-{ in an otherwise correct URL string, do: }
++{ in anotherwise correct URL string, do: }
+ 
+ { newString = CFURLCreateStringByAddingPercentEscapes(NULL, origString, NULL, NULL, kCFStringEncodingUTF8); }
+ function CFURLCreateStringByAddingPercentEscapes( allocator: CFAllocatorRef; originalString: CFStringRef; charactersToLeaveUnescaped: CFStringRef; legalURLCharactersToBeEscaped: CFStringRef; encoding: CFStringEncoding ): CFStringRef; external name '_CFURLCreateStringByAddingPercentEscapes';
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas	(working copy)
+@@ -2979,7 +2979,7 @@
+  *  
+  *  Discussion:
+  *    Advances the focus to the next most appropriate view. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas	(working copy)
+@@ -15159,7 +15159,7 @@
+ 		The reason for passing in this flag is to provide correct audit trail information and to avoid unnecessary user interaction.
+ 
+     @param rights (input/optional) An AuthorizationItemSet containing rights for which authorization is being requested.  If none are specified the resulting AuthorizationRef will authorize nothing at all.
+-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
++    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
+     @param authorization (output optional) A pointer to an AuthorizationRef to be returned.  When the returned AuthorizationRef is no longer needed AuthorizationFree should be called to prevent anyone from using the aquired rights.  If NULL is specified no new rights are returned, but the system will attempt to authorize all the requested rights and return the appropriate status.
+ 
+@@ -15213,7 +15213,7 @@
+ 
+     @param authorization (input) The authorization object on which this operation is performed.
+     @param rights (input) A rights set (see AuthorizationCreate).
+-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
++    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
+     @param authorizedRights (output/optional) A pointer to a newly allocated AuthorizationInfoSet in which the authorized subset of rights are returned (authorizedRights should be deallocated by calling AuthorizationFreeItemSet() when it is no longer needed).  If NULL the only information returned is the status.  Note that if the kAuthorizationFlagPreAuthorize flag was specified rights that could not be preauthorized are returned in authorizedRights, but their flags contains the kAuthorizationFlagCanNotPreAuthorize bit.
+ 
+@@ -75251,7 +75251,7 @@
+     @constant       kAudioHardwarePropertyPlugInForBundleID
+                         Using an AudioValueTranslation structure, this property translates the input
+                         CFString containing a bundle ID into the AudioObjectID of the AudioPlugIn
+-                        that corresponds to it. This property will return kAudioObjectUnkown if the
++                        that corresponds to it. This property will return kAudioObjectUnknown if the
+                         given bundle ID doesn't match any AudioPlugIns.
+ }
+ const
+@@ -77465,7 +77465,7 @@
+ { are not legal URL characters (based on RFC 2396), plus any characters }
+ { in legalURLCharactersToBeEscaped, less any characters in }
+ { charactersToLeaveUnescaped.  To simply correct any non-URL characters }
+-{ in an otherwise correct URL string, do: }
++{ in anotherwise correct URL string, do: }
+ 
+ { newString = CFURLCreateStringByAddingPercentEscapes(NULL, origString, NULL, NULL, kCFStringEncodingUTF8); }
+ function CFURLCreateStringByAddingPercentEscapes( allocator: CFAllocatorRef; originalString: CFStringRef; charactersToLeaveUnescaped: CFStringRef; legalURLCharactersToBeEscaped: CFStringRef; encoding: CFStringEncoding ): CFStringRef; external name '_CFURLCreateStringByAddingPercentEscapes';
+@@ -105421,7 +105421,7 @@
+ 
+ { Set the next image in the image destination `idst' to be the image at
+  * `index' in the image source `isrc'.  The index is zero-based. The
+- * properties of the source image can be added to or overriden by supplying
++ * properties of the source image can be added to or overridden by supplying
+  * additional keys/values in `properties'.  If a key in `properties' has
+  * the value kCFNull, the corresponding property in the destination will be
+  * removed. }
+@@ -120291,7 +120291,7 @@
+  }
+ function DriverInstallReserveMem(drvrPtr: DRVRHeaderPtr; refNum: SInt16): OSErr; external name '_DriverInstallReserveMem';
+ {
+-  Note: DrvrInstall() is no longer supported, becuase it never really worked anyways.
++  Note: DrvrInstall() is no longer supported, because it never really worked anyways.
+         There will soon be a DriverInstall() which does the right thing.
+ 
+         DrvrRemove has been renamed to DriverRemove.  But, InterfaceLib for PowerPC
+@@ -160022,7 +160022,7 @@
+  *  
+  *  Discussion:
+  *    Advances the focus to the next most appropriate control. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+@@ -160059,7 +160059,7 @@
+  *  
+  *  Discussion:
+  *    Reverses the focus to the next most appropriate control. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+@@ -190186,7 +190186,7 @@
+  *  
+  *  Discussion:
+  *    Advances the focus to the next most appropriate view. Unless
+- *    overriden in some fashion (either by overriding certain carbon
++ *    overridden in some fashion (either by overriding certain carbon
+  *    events or using the HIViewSetNextFocus API), the Toolbox will use
+  *    a spacially determinant method of focusing, attempting to focus
+  *    left to right, top to bottom in a window, taking groups of
+@@ -229828,7 +229828,7 @@
+ 	kPassThrough				= $00010000;
+ 	kNoSoundComponentChain		= $00020000;
+ 
+-	{ SoundParamBlock flags, usefull for OpenMixerSoundComponent }
++	{ SoundParamBlock flags, useful for OpenMixerSoundComponent }
+ 	kNoMixing					= $01;							{ don't mix source }
+ 	kNoSampleRateConversion		= $02;							{ don't convert sample rate (i.e. 11 kHz -> 22 kHz) }
+ 	kNoSampleSizeConversion		= $04;							{ don't convert sample size (i.e. 16 -> 8) }
+Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc	(working copy)
+@@ -31,7 +31,7 @@
+     end
+   else
+     begin
+-    // Here we are in the daemonized proces
++    // Here we are in the daemonized process
+     sid := FpSetsid;
+     if sid < 0 then
+       raise Exception.Create(SErrFailedToFork);
+Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp	(working copy)
+@@ -73,7 +73,7 @@
+ // To determine how many environment variables have been stored you can
+ // use the VariableCount property.
+ //
+-// The following procedure loops through all of the enviroment variables
++// The following procedure loops through all of the environment variables
+ // and prints them back to the client. This is a good CGI example to
+ // show you exactly what information you have to work with.
+ 
+Index: fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp	(working copy)
+@@ -1,7 +1,7 @@
+ Program yesno;
+ {
+   A box with two buttons and a string. Simple boxes like this
+-   are very usefull for asking questions
++   are very useful for asking questions
+ }
+ 
+ Uses xforms;
+Index: fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp	(working copy)
+@@ -81,7 +81,7 @@
+ end;
+ 
+ begin
+-   { application default. Can be overriden by the command line options }
++   { application default. Can be overridden by the command line options }
+    fl_set_border_width(-2);
+ 
+    fl_initialize(@argc, argv, 'FormDemo', nil, 0);
+Index: fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas	(working copy)
+@@ -67,7 +67,7 @@
+     WHEEL_Green          = (WHEEL_Dummy+6) ;  { set/get Green     }
+     WHEEL_Blue           = (WHEEL_Dummy+7) ;  { set/get Blue              }
+     WHEEL_RGB            = (WHEEL_Dummy+8) ;  { set/get ColorWheelRGB     }
+-    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/enviroment    }
++    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/environment    }
+     WHEEL_Abbrv          = (WHEEL_Dummy+10);  { "GCBMRY" if English       }
+     WHEEL_Donation       = (WHEEL_Dummy+11);  { colors donated by app     }
+     WHEEL_BevelBox       = (WHEEL_Dummy+12);  { inside a bevel box        }
+Index: fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas	(working copy)
+@@ -4982,7 +4982,7 @@
+ //*          exception to this is if ProcessItem sets *Error to       */
+ //*          DLIST_SEARCH_COMPLETE, in which case ForEachItem         */
+ //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
+-//*          usefull for using ForEachItem to search a list and then  */
++//*          useful for using ForEachItem to search a list and then  */
+ //*          terminating the search once the desired item is found.   */
+ //*                                                                   */
+ //*          A word about the Parameters parameter.  This parameter   */
+@@ -5083,7 +5083,7 @@
+ //*          exception to this is if KillItem sets *Error to          */
+ //*          DLIST_SEARCH_COMPLETE, in which case KillItem            */
+ //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
+-//*          usefull for using KillItem to search a list and then     */
++//*          useful for using KillItem to search a list and then     */
+ //*          terminating the search once the desired item is found.   */
+ //*                                                                   */
+ //*          A word about the Parameters parameter.  This parameter   */
+Index: fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt	(working copy)
+@@ -81,7 +81,7 @@
+    SOM and WPS toolkits will be presented)
+ c) SEAL library interface (seal.pas) www.netlabs.org/hobbes.nmsu.edu
+    SEAL is module player library. At the present time SEAL not developing
+-   anymore (for all platforms), but still very usefull for mudule music fans.
++   anymore (for all platforms), but still very useful for mudule music fans.
+ d) DualMode Library (dual.pas) www.netlabs.org
+    DualMode library allows to use common access method as for fullscreen (MGL)
+    as for windowed (DIVE) video modes.
+Index: fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc	(working copy)
+@@ -556,7 +556,7 @@
+ (**
+  * XML_SCHEMAS_TYPE_REDEFINING:
+  *
+- * The type redefines an other type.
++ * The type redefines another type.
+  *)
+ (*   XML_SCHEMAS_TYPE_REDEFINING    = (1 shl 31); *)
+ {$ENDIF}
+@@ -872,7 +872,7 @@
+ (**
+  * XML_SCHEMAS_INCLUDING_CONVERT_NS:
+  *
+- * the schema is currently including an other schema with
++ * the schema is currently including another schema with
+  * no target namespace.
+  *)
+   XML_SCHEMAS_INCLUDING_CONVERT_NS            = (1 shl 9);
+Index: fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp	(working copy)
+@@ -88,7 +88,7 @@
+   //load our ball pcx file into an image
+   loadPCX(pcuint8(ball_pcx), @ball);
+ 
+-  //tile it so it is usefull as sprite data
++  //tile it so it is useful as sprite data
+   imageTileData(@ball);
+ 
+   // Sprite initialisation
+Index: fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc	(working copy)
+@@ -41,7 +41,7 @@
+      of brackets. Returns G_TOKEN_NONE if succesful, otherwise returns
+      the token it expected but didn't get.
+     }
+-{ Combine RC style data from src into dest. If overriden, this
++{ Combine RC style data from src into dest. If overridden, this
+      function should chain to the parent.
+     }
+ { Create an empty style suitable to this RC style
+Index: fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc
+===================================================================
+--- fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc	(revision 14817)
++++ fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc	(working copy)
+@@ -105,7 +105,7 @@
+        must not be freed.  }
+     function g_getenv(variable:Pgchar):Pgchar;cdecl;external gliblib name 'g_getenv';
+ 
+-    { we try to provide a usefull equivalent for ATEXIT if it is
++    { we try to provide a useful equivalent for ATEXIT if it is
+        not defined, but use is actually abandoned. people should
+        use g_atexit() instead.
+       }
+Index: fpcbuild-2.4.0/install/doc/readme.txt
+===================================================================
+--- fpcbuild-2.4.0/install/doc/readme.txt	(revision 751)
++++ fpcbuild-2.4.0/install/doc/readme.txt	(working copy)
+@@ -88,7 +88,7 @@
+ - smartlinking (not yet supported under Mac OS X)
+ - support for the GNU debugger
+ - integrated development environment (disabled by default on Mac OS X)
+-  - powerfull user friendly Wordstar compatible multi file editor
++  - powerful user friendly Wordstar compatible multi file editor
+   - context sensitive help supports help files in HTML, Windows HLP and
+     Borland TPH format.
+   - debugger on most platforms
+Index: fpcbuild-2.4.0/install/man/man1/fpc.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/fpc.1	(revision 751)
++++ fpcbuild-2.4.0/install/man/man1/fpc.1	(working copy)
+@@ -51,7 +51,7 @@
+ 
+ .SH Usage
+ 
+-The compilation proces is started by typing
++The compilation process is started by typing
+ .I fpc
+ followed by a sourcefile name (normally with .pas or .pp extension). Before processing the actual processing of the source file,
+ .BR fpc.cfg (5)
+Index: fpcbuild-2.4.0/install/man/man1/fp.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/fp.1	(revision 751)
++++ fpcbuild-2.4.0/install/man/man1/fp.1	(working copy)
+@@ -1,6 +1,6 @@
+ .TH fp 1 "14 apr 2006" "Free Pascal" "Free Pascal IDE"
+ .SH NAME
+-fp \- Free Pascal Compiler (FPC) integrated development enviroment
++fp \- Free Pascal Compiler (FPC) integrated development environment
+ 
+ .SH SYNOPSIS
+ 
+@@ -44,7 +44,7 @@
+ .SH Usage
+ 
+ The user interface of the IDE has been designed to be similar to Turbo Pascal.
+-It provides the user with a user friendly, but rather powerfull editor, an extensive
++It provides the user with a user friendly, but rather powerful editor, an extensive
+ on-line help system and a debugger.
+ 
+ A text mode windowing system is the base of the user interface. The mouse is supported,
+@@ -57,7 +57,7 @@
+ 
+ No help files are provided by default. The user must download the Free Pascal documentation
+ in HTML format and install it into the IDE using the Help->Files menu. Turbo Pascal .tph
+-files can also be installed in this menu and can be usefull for source code that ships with
++files can also be installed in this menu and can be useful for source code that ships with
+ .BR .tph files as documentation.
+ 
+ .SH Character sets
+Index: fpcbuild-2.4.0/demo/netware/check.pp
+===================================================================
+--- fpcbuild-2.4.0/demo/netware/check.pp	(revision 751)
++++ fpcbuild-2.4.0/demo/netware/check.pp	(working copy)
+@@ -18,7 +18,7 @@
+ {$Copyright (c) 2002 the FreePascal development team}
+ 
+ 
+-{ using crt automaticly calls _SetAutoScreenDestructionMode (TRUE);
++{ using crt automatically calls _SetAutoScreenDestructionMode (TRUE);
+   so no "Press any key to close screeen" will be shown by netware }
+ uses crt;
+ 
--- fpc-2.4.0.orig/debian/patches/man_files.diff
+++ fpc-2.4.0/debian/patches/man_files.diff
@@ -0,0 +1,424 @@
+This patch adds a basic man page to fpclasschart utility program and fixes typos
+in various man pages for other tools.
+
+Index: fpcbuild-2.4.0/install/man/man5/fpc.cfg.5
+===================================================================
+--- fpcbuild-2.4.0/install/man/man5/fpc.cfg.5	(révision 746)
++++ fpcbuild-2.4.0/install/man/man5/fpc.cfg.5	(copie de travail)
+@@ -117,7 +117,7 @@
+ .IP \fIExample\fP
+ #IFNDEF VER0_99_12
+ .br
+--Fu/usr/lib/fpc/0.99.13/rtl
++\-Fu/usr/lib/fpc/0.99.13/rtl
+ .br
+ #ENDIF
+ .PP
+@@ -141,11 +141,11 @@
+ 
+ #IFDEF VER0_99_12
+ .br
+--Fu/usr/lib/fpc/0.99.12/rtl
++\-Fu/usr/lib/fpc/0.99.12/rtl
+ .br
+ #ELSE
+ .br
+--Fu/usr/lib/fpc/0.99.13/rtl
++\-Fu/usr/lib/fpc/0.99.13/rtl
+ .br
+ #ENDIF
+ .br
+@@ -178,7 +178,7 @@
+ #UNDEF name
+ 
+ #UNDEF un-defines a keyword if it existed.
+-This has the same effect as a "-uname" command-line option.
++This has the same effect as a "\-uname" command-line option.
+ .RE
+ 
+ .IP \fI#WRITE\fP
+@@ -194,7 +194,7 @@
+ .br
+ #WRITE Setting debugging ON...
+ .br
+--g
++\-g
+ .br
+ #ENDIF
+ .br
+@@ -253,7 +253,7 @@
+ 
+ A standard block often used in (the Linux version of) fpc.cfg is
+ 
+--vwhin
++\-vwhin
+ .br
+ #IFDEF VER0_99_12
+ .br
+Index: fpcbuild-2.4.0/install/man/man1/ptop.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/ptop.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/ptop.1	(copie de travail)
+@@ -6,7 +6,7 @@
+ 
+ .SH SYNOPSIS
+ 
+-.BI ptop "[-v] [-i indent] [-b bufsize ][-c optsfile] infile outfile"
++.BI ptop [\-v] [\-i indent] [\-b bufsize ][\-c optsfile]  
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/ppudump.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/ppudump.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/ppudump.1	(copie de travail)
+@@ -4,7 +4,7 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fIppudump\fP [-h] [-v[h|i|m|d|s|b|a]] ppu-file1 ppufile2 ...
++\fIppudump\fP [\-h] [\-v[h|i|m|d|s|b|a]] ppu-file1 ppufile2 ...
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/ppumove.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/ppumove.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/ppumove.1	(copie de travail)
+@@ -4,7 +4,7 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fBppumove\fP [-sqbhw] [-o File] [-d path] [-e extension] files...
++\fBppumove\fP [\-sqbhw] [\-o File] [\-d path] [\-e extension] files...
+ 
+ .SH Description
+ 
+@@ -75,4 +75,4 @@
+ .IP 
+ .BR  ppc386 (1)
+ .BR  ppudep (1)
+-.BR  ppudump (1)
+\ No newline at end of file
++.BR  ppudump (1)
+Index: fpcbuild-2.4.0/install/man/man1/fpdoc.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/fpdoc.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/fpdoc.1	(copie de travail)
+@@ -4,11 +4,11 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fBfpdoc\fP --input=inputcommand [--output=output] [--format=fmt] 
+-[--descr=descriptionfile] [--show-private] [--hide-protected]
+-[--lang=language] [--content=contentfile] [--import=importfile]
+-[--package=packagename] [--html-search=searchpage] [--ostarget=target]
+-[--cpu-target=target] [--latex-extension=ext] [--latex-highlight]
++\fBfpdoc\fP \-\-input=inputcommand [\-\-output=output] [\-\-format=fmt] 
++[\-\-descr=descriptionfile] [\-\-show-private] [\-\-hide-protected]
++[\-\-lang=language] [\-\-content=contentfile] [\-\-import=importfile]
++[\-\-package=packagename] [\-\-html-search=searchpage] [\-\-ostarget=target]
++[\-\-cpu-target=target] [\-\-latex-extension=ext] [\-\-latex-highlight]
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/ppdep.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/ppdep.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/ppdep.1	(copie de travail)
+@@ -4,7 +4,7 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fBppdep\fP [-DDefine] [-oFile] [-eext] [-V] [-h] [A[call]] file
++\fBppdep\fP [\-DDefine] [\-oFile] [\-eext] [\-V] [\-h] [A[call]] file
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/makeskel.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/makeskel.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/makeskel.1	(copie de travail)
+@@ -5,13 +5,13 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fBmakeskel\fP [--descr=filename] [--disable-arguments] 
+-[--disable-errors] [--disable-function-results] 
+-[--disable-private] [--disable-protected] 
+-[--disable-seealso] [--emit-class-separator] 
+-[--help] [--lang=language] [--output=filename] 
+-[--update]
+---package=name --input=cmdline
++\fBmakeskel\fP [\-\-descr=filename] [\-\-disable-arguments] 
++[\-\-disable-errors] [\-\-disable-function-results] 
++[\-\-disable-private] [\-\-disable-protected] 
++[\-\-disable-seealso] [\-\-emit-class-separator] 
++[\-\-help] [\-\-lang=language] [\-\-output=filename] 
++[\-\-update]
++\-\-package=name \-\-input=cmdline
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/rstconv.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/rstconv.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/rstconv.1	(copie de travail)
+@@ -4,7 +4,7 @@
+ 
+ .SH SYNOPSIS
+ 
+-.B rstconv [options] -o outfile
++.B rstconv [options] \-o outfile
+ 
+ .SH DESCRIPTION
+ 
+@@ -27,7 +27,7 @@
+ 
+ .SH OPTIONS
+ .TP
+-.BI -f " format"
++.BI \-f " format"
+ Specify the output file format. Currently only the following format is
+ supported:
+ .RS
+@@ -42,7 +42,7 @@
+ unit.
+ .RE
+ .TP
+-.B "-h (or --help)"
++.B \-h (or \-\-help)
+ outputs a short help message.
+ .TP
+ .BI \-i " infile"
+Index: fpcbuild-2.4.0/install/man/man1/pyacc.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/pyacc.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/pyacc.1	(copie de travail)
+@@ -11,13 +11,13 @@
+ SH OPTIONS
+ 
+ .TP
+-.B -v
++.B \-v
+ .I Verbose:
+ Pascal Yacc generates a readable description of the generated
+ parser, written to yacc-file with new extension 
+ .I .lst.
+ .TP
+-.B -d
++.B \-d
+ .I Debug:
+ TP Yacc generates a parser with debugging output.
+ 
+Index: fpcbuild-2.4.0/install/man/man1/unitdiff.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/unitdiff.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/unitdiff.1	(copie de travail)
+@@ -4,8 +4,8 @@
+ 
+ .SH SYNOPSIS
+ 
+-\fBunitdiff\fP [--disable-arguments] [--disable-private] [--disable-protected] 
+-[--help] [--lang=language] [--list] [--output=filename] [--sparse] file1 file2
++\fBunitdiff\fP [ \-\-disable-arguments] [ \-\-disable-private] [ \-\-disable-protected] 
++[ \-\-help] [ \-\-lang=language] [ \-\-list] [ \-\-output=filename] [ \-\-sparse] file1 file2
+ 
+ .SH Description
+ 
+Index: fpcbuild-2.4.0/install/man/man1/fpc.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/fpc.1	(révision 746)
++++ fpcbuild-2.4.0/install/man/man1/fpc.1	(copie de travail)
+@@ -77,7 +77,7 @@
+ .BI \-i
+ This option tells the compiler to print the copyright information.
+ 
+-You can give it an option, as -ixxx where "xxx" can be one of the
++You can give it an option, as \-ixxx where "xxx" can be one of the
+ following:
+ .RS
+ .TP
+@@ -100,14 +100,14 @@
+ Returns the target Processor.
+ .RE
+ .TP
+-.I -l
++.I \-l
+ This option tells the compiler to print the
+ .I FPC
+ logo on standard output. It also gives you the
+ .I FPC
+ version number.
+ .TP
+-.I -n
++.I \-n
+ Tells the compiler not to read the configuration file
+ .BR fpc.cfg (5)
+ 
+@@ -181,7 +181,7 @@
+ .PP
+ Options concerning files and directories
+ .TP
+-.BI -e xxx
++.BI \-e xxx
+ tells the compiler that 
+ .I xxx
+ is the directory where it can find the executables as (the assembler) and 
+@@ -276,7 +276,7 @@
+ .BI \-at
+ Tells the compiler to include temparary register allocation/deallocation information.
+ .TP
+-.BI -A xxx
++.BI \-A xxx
+ specifies what kind of assembler should be generated . Here
+ .I xxx
+ is one of the following :
+@@ -383,7 +383,7 @@
+ 
+ .TP
+ .BI \-E
+-Same as -Cn.
++Same as \-Cn.
+ .TP
+ .BI \-g
+ Generate debugging information for debugging with
+@@ -392,7 +392,7 @@
+ .TP
+ .BI \-gg
+ idem as 
+-.B -g.
++.B \-g.
+ .TP
+ .BI \-gd
+ generate debugging info for dbx.
+@@ -434,7 +434,7 @@
+-Level 2 optimizations (-O1 plus some slower optimizations).
++Level 2 optimizations (\-O1 plus some slower optimizations).
+ .TP
+ .I 3
+-Level 3 optimizations (-O2 plus -Ou).
++Level 3 optimizations (\-O2 plus \-Ou).
+ .TP
+ .I pn
+ Specify processor : n can be one of
+@@ -473,7 +473,7 @@
+ cross-compiling.
+ .TP
+ .BI \-sr
+-Skip register allocation stage in compiler (use with -ar) 
++Skip register allocation stage in compiler (use with \-ar) 
+ .TP
+ .BI \-st
+ Tells the compiler to generate a script that can be used to assemble 
+@@ -526,7 +526,7 @@
+ Windows 32 bit.
+ .RE
+ .TP
+-.BI -u xxx
++.BI \-u xxx
+ undefine the symbol 
+ .I xxx
+ if it is defined. This is the opposite of the 
+@@ -564,7 +564,7 @@
+ Link with static libraries (defines the FPC_LINK_STATIC symbol)
+ .TP
+ .I t
+-Link statically (passes -static to the linker)
++Link statically (passes \-static to the linker)
+ .TP
+ .I X
+ Link smart. Using this option sets the FPC_LINK_SMART symbol.
+@@ -582,7 +582,7 @@
+ .TP
+ .I delphi
+ Delphi-compatibility mode. This loads the objpas unit, and switches on ansistring mode (
+-.B -Sh
++.B \-Sh
+ ).
+ .TP
+ .I fpc
+@@ -627,7 +627,7 @@
+ Generate code for assertions.
+ .TP
+ .BI \-Sc
+-Support C-style operators, i.e. *=, +=, /= and -=.
++Support C-style operators, i.e. *=, +=, /= and \-=.
+ .TP
+ .BI \-Sd
+ Tries to be Delphi compatible
+Index: fpcbuild-2.4.0/install/man/man1/fpclasschart.1
+===================================================================
+--- fpcbuild-2.4.0/install/man/man1/fpclasschart.1	(révision 0)
++++ fpcbuild-2.4.0/install/man/man1/fpclasschart.1	(révision 0)
+@@ -0,0 +1,70 @@
++.TH fpclasschart 1 "9 december 2009" "Free Pascal" "Free Pascal class tree generator"
++.SH NAME
++fpclasschart \- The Free Pascal class tree generator.
++
++.SH SYNOPSIS
++
++\fBfpclasschart\fP \-\-input=cmdline \-\-output=filename [\-\-merge=filename] 
++[\-\-kind=objectkind] [\-\-lang=language] [\-\-help]
++
++.SH Description
++
++.B fpclasschart
++Creates class tree from pascal source
++
++.SH Usage
++
++You can invoke 
++.B fpclasschart
++with as one or more options.
++
++.SH Options
++
++.B fpclasschart
++has several options, most of them optional, defaults will be used in most
++cases.
++
++.TP
++.BI \-\-input=cmdline
++This option tells 
++.B fpclasschart
++to generate a tree file. The command line is the same as the compiler's one
++used to compile the source file.
++.TP
++.BI \-\-output=filename
++This option specifies the name of the generated file
++.B descfile
++that contains the actual chart for the object tree. 
++.TP
++.BI \-\-merge=filename
++Gives a path to a file already containing an object tree to merge.
++.TP
++.BI \-\-kind=objectkind
++Specifys object kind. One of \fIobject\fP, \fIclass\fP, \fIinterface\fP.
++.TP
++.BI \-\-lang=language
++Sets the language for the output file. This will mainly set the strings used
++for the headers in various parts of the documentation files (by default
++they're in english). Currently, valid options are
++.RS
++.TP
++.TP
++.TP
++.I de 
++German.
++.TP
++.I fr
++French.
++.TP
++.I nl
++Dutch.
++.RE
++.TP
++.BI \-\-help
++Writes a help message.
++
++.SH SEE ALSO
++.IP 
++.BR  ppc386 (1)
++.BR  latex (1)
++.BR  makeskel (1)
--- fpc-2.4.0.orig/debian/patches/documentation.diff
+++ fpc-2.4.0/debian/patches/documentation.diff
@@ -0,0 +1,16 @@
+This patch removes a sanity check on compiler version. Indeed in order to build
+the documentation of 2.4.0 we need some fixes in fcl-xml package. Thoses fixes were ported in 2.2.4-5 is required to build the documentation. Without this
+patch FPC documentation won't build on Debian and will FTBFS.
+
+--- fpcbuild-2.4.0~/fpcdocs/relinkdocs.pp
++++ fpcbuild-2.4.0/fpcdocs/relinkdocs.pp
+@@ -22,9 +22,6 @@
+ {$stringchecks on}
+ {$endif}
+ {$info only works properly with 2.3.1+ of july 2009 or newer }
+-{$ifdef ver2_2}
+-   Die.
+-{$endif}
+ 
+ Uses cthreads,strutils,typinfo,Sax_HTML,sysutils,classes,dom_html,xmlwrite,htmwrite8859,relinkhtml;
+