z88dk (1.8.ds1-7) debian-dir only changes

Summary

 debian/README.Debian-source                         |   12 
 debian/changelog                                    |  168 ++++
 debian/control                                      |   58 +
 debian/manpages/appmake.1                           |  272 +++++++
 debian/manpages/appmake.1.txt                       |  114 +++
 debian/manpages/copt.1                              |   79 ++
 debian/manpages/copt.1.txt                          |   63 +
 debian/manpages/makemanpages.sh                     |   15 
 debian/manpages/z80asm.1                            |   92 ++
 debian/manpages/z80asm.1.txt                        |   44 +
 debian/manpages/z88dk.1                             |   42 +
 debian/manpages/z88dk.1.txt                         |   33 
 debian/manpages/zcc.1                               |  255 +++++++
 debian/manpages/zcc.1.txt                           |  139 +++
 debian/packages                                     |  210 +++++
 debian/patches/02_lib_cpc_crt0.asm.diff             |  235 ++++++
 debian/patches/03_libsrc_graphics_x11_Makefile.diff |   60 +
 debian/patches/03_libsrc_oz_ozinput_Makefile.diff   |   11 
 debian/patches/04_src1.8_64bitsupport.diff          |  720 ++++++++++++++++++++
 debian/patches/04_src_appmake.diff                  |  345 +++++++++
 debian/patches/04_src_zcc_zcc.c.diff                |   62 +
 debian/patches/05_src_z80asm_z80pass.c.diff         |   29 
 debian/po/POTFILES.in                               |    1 
 debian/po/cs.po                                     |   24 
 debian/po/de.po                                     |   21 
 debian/po/es.po                                     |   44 +
 debian/po/fr.po                                     |   22 
 debian/po/ja.po                                     |   22 
 debian/po/nl.po                                     |   23 
 debian/po/pl.po                                     |   22 
 debian/po/pt.po                                     |   24 
 debian/po/ru.po                                     |   25 
 debian/po/sv.po                                     |   23 
 debian/po/templates.pot                             |   23 
 debian/rules                                        |  466 ++++++++++++
 debian/templates                                    |    6 
 36 files changed, 3804 insertions(+)

    
download this patch

Patch contents

--- z88dk-1.8.ds1.orig/debian/packages
+++ z88dk-1.8.ds1/debian/packages
@@ -0,0 +1,210 @@
+%define z88dk_application zcc appmake copt sccz80 z80asm zcpp
+%define z88dk_prefix z88dk-
+%define z88dk_alternative_level 20
+
+Source: z88dk
+Section: devel
+Priority: extra
+Patches: patches/*.diff
+Maintainer: Krystian Wlosek <kwlosek@gmail.com>
+Uploaders: Piotr Roszatycki <dexter@debian.org>
+Standards-Version: 3.8.3
+Build-Depends: po-debconf, patch, yada
+# , gcc-multilib [amd64 ppc64 kfreebsd-amd64]
+Upstream-Source: <URL:http://sourceforge.net/project/showfiles.php?group_id=2917>
+Home-Page: <URL:http://www.z88dk.org/>
+Description: a Z80 processor assembler and SmallC+ cross compiler
+Major-Changes:
+  * Repackage upstream source:
+    - remove CVS directories
+    - remove binary files
+  * Patched sccz80/stmt.c.diff
+    http://sourceforge.net/tracker/index.php?func=detail&aid=1377968&group_id=2917&atid=302917
+  * Patched Makefile - clean install procedure
+  * Added prefix z88dk- to executable file.
+  * Added alternative links.
+Copyright: Artistic
+ Copyright (c) 2000-2008 by Dom Morris and others. All rights reserved. This program is free software; you can redistribute it and/or modify it under The Clarified Artistic License.
+Build-Arch: bash
+ rm -rf bin usr
+ mkdir -p bin usr
+ export CC="gcc"
+ export CFLAGS="-g -O2 -Wall"
+# case "$DEB_BUILD_ARCH" in
+#    amd64|ppc64|kfreebsd-amd64|sparc64)
+# 	echo "Detected 64bit architecture"
+# 	export CFLAGS="$CFLAGS -m32"
+# 	export LDFLAGS="$LDGLAGS -m32"
+# 	;;
+# esac
+ make -e prefix=/usr
+Build-Indep: bash
+ export Z80_OZFILES=$(pwd)/lib/
+ export ZCCCFG=$(pwd)/lib/config/
+ # create symlink 
+ pushd $(pwd)/include; ln -vs x11 X11; popd
+ PATH=$(pwd)/bin:$PATH make -C $(pwd)/libsrc
+Clean: sh
+# case "$DEB_BUILD_ARCH" in
+#    alpha|ia64)
+# 	echo "architecture not supported by upstream."
+# 	exit 1
+# 	;;
+# esac
+ rm -rf bin usr src/config.h libsrc/debug/zcc_opt.def libsrc/graphics/x11/zcc_opt.def include/X11
+ make clean || true
+
+
+
+
+
+
+Package: z88dk-bin
+Architecture: any
+Depends: z88dk-data (>= ${binary:Version}), []
+Description: executable files for z88dk
+ z88dk is a Z80 processor cross compiler producing binaries for over
+ 25 different z80 based machines. This package contains binary files.
+Alternatives:
+ /usr/bin/zcc -> zcc -> /usr/bin/z88dk-zcc (%{z88dk_alternative_level})
+ /usr/bin/appmake -> appmake -> /usr/bin/z88dk-appmake (%{z88dk_alternative_level})
+ /usr/bin/copt -> copt -> /usr/bin/z88dk-copt (%{z88dk_alternative_level})
+ /usr/bin/sccz80 -> sccz80 -> /usr/bin/z88dk-sccz80 (%{z88dk_alternative_level})
+# ? conflict with z80asm package
+ /usr/bin/z80asm -> z80asm -> /usr/bin/z88dk-z80asm (%{z88dk_alternative_level})
+ /usr/bin/zcpp -> zcpp -> /usr/bin/z88dk-zcpp (%{z88dk_alternative_level})
+Install: sh
+ yada copy -bin bin/*
+ APPS="%{z88dk_application}"
+ PREFIX="%{z88dk_prefix}"
+ for a in $APPS; do
+    mv -v $ROOT/usr/bin/$a $ROOT/usr/bin/${PREFIX}$a
+ done
+ yada install -man debian/manpages/zcc.1 -as %{z88dk_prefix}zcc.1
+ yada symlink -man %{z88dk_prefix}zcc.1 -as zcc.1
+ yada install -man debian/manpages/appmake.1 -as %{z88dk_prefix}appmake.1
+ yada symlink -man %{z88dk_prefix}appmake.1 -as appmake.1
+ yada install -man debian/manpages/copt.1 -as %{z88dk_prefix}copt.1
+ yada symlink -man %{z88dk_prefix}copt.1 -as copt.1
+ yada install -man debian/manpages/z80asm.1 -as %{z88dk_prefix}z80asm.1
+#conflict with z80asm package
+#yada symlink -man %{z88dk_prefix}z80asm.1 -as z80asm.1
+# sccz80 is link to zcc
+ yada symlink -man  %{z88dk_prefix}zcc.1 -as %{z88dk_prefix}sccz80.1
+ yada symlink -man  %{z88dk_prefix}zcc.1 -as sccz80.1
+ yada symlink -into /usr/lib /usr/share/z88dk
+Overrides:
+ binary-without-manpage usr/bin/z88dk-zcpp
+
+
+
+
+Package: z88dk-doc
+Section: doc
+Architecture: all
+Replaces: z88dk-examples
+Conflicts: z88dk-examples
+Provides: z88dk-examples
+Description: documentation and examples for z88dk
+ This is documentation for z88dk compilers. Also example programs with sources
+ are available. See the z88dk package for more details.
+Install: sh
+ yada copy -doc -subdir doc doc/*
+ #no strange manpages yet
+ rm -rf $ROOT/usr/share/doc/$PACKAGE/doc/netman
+ #fix perms
+ find $ROOT/usr/share/doc/$PACKAGE/doc -type d -exec chmod 755 {} \;
+ find $ROOT/usr/share/doc/$PACKAGE/doc -type f -exec chmod 644 {} \;
+ # merged with -examples
+ yada copy -doc -subdir examples examples/*
+ #fix perms
+ find $ROOT/usr/share/doc/$PACKAGE/examples -type d -exec chmod 755 {} \;
+ find $ROOT/usr/share/doc/$PACKAGE/examples -type f -exec chmod 644 {} \;
+
+
+
+
+
+
+
+
+Package: z88dk-data
+Architecture: all
+Replaces: z88dk
+Depends: []
+Description: data files for z88dk
+ This package contains any data files needed by z88dk tools.
+Install: bash
+ export Z80_OZFILES=$(pwd)/lib/
+ export ZCCCFG=$(pwd)/lib/config/
+ #PATH=$(pwd)/bin:$PATH make -C $(pwd)/libsrc
+ PATH=$(pwd)/bin:$PATH make -C $(pwd)/libsrc install
+ make prefix=/usr DESTDIR=$ROOT install
+ # no executable files
+ rm -rf $ROOT/usr/bin
+ # no default config
+ rm -f $ROOT/usr/share/z88dk/lib/config/zcc.cfg
+ rm -f $ROOT/usr/share/z88dk/lib/config/*.lnx
+ for i in $ROOT/usr/share/z88dk/lib/config/*.cfg; do echo "file: $i";
+    mv $i $i.tmp; cat $i.tmp | \
+    sed 's/^Z80EXE.*$/Z80EXE\t\t%{z88dk_prefix}z80asm/g' | sed 's/^CPP.*$/CPP\t\t%{z88dk_prefix}zcpp/g' | \
+    sed 's/^LINKER.*$/LINKER\t\t%{z88dk_prefix}z80asm/g' | sed 's/^COMPILER.*$/COMPILER\t%{z88dk_prefix}sccz80/g' | \
+    sed 's/^COPTEXE.*$/COPTEXE\t\t%{z88dk_prefix}copt/g' | sed 's/^APPMAKER.*$/APPMAKER\t%{z88dk_prefix}appmake/g' > $i;
+     rm $i.tmp;
+ done
+ yada install -doc EXTENSIONS README.1st
+ yada install -man debian/manpages/z88dk.1
+# moved to z88dk-bin
+# yada symlink -into /usr/lib /usr/share/z88dk
+
+
+
+
+
+
+Package: z88dk
+Architecture: any
+Depends: z88dk-bin (>= ${binary:Version}), z88dk-data (>= ${binary:Version}), debconf
+Suggests: z88dk-doc, z88dk-examples
+Description: a Z80 processor assembler and SmallC+ cross compiler
+ z88dk is a SmallC+ and Z80 assemler cross compiler supplied with an
+ assembler/linker and a set of libraries implementing the C standard library
+ for a number of different z80 based machines. The name z88dk originates from
+ the time when the project was founded and supported only the Cambridge
+ z88 portable.
+ .
+ Supported machines:
+ Cambridge Computers z88, Sinclair ZX Spectrum, Sinclair ZX81, CP/M based
+ machines, Amstrad NC100, VZ200/300, Sharp MZ series, TI calculators (TI82,
+ TI83, TI83+, TI85, TI86), ABC80, Jupiter Ace, Xircom REX 6000, Peters
+ Sprinter, Sam Coupe, MSX1, Spectravideo, Mattel Aquarius, Peters Sprinter,
+ and C128 (in z80 mode) machines.
+ .
+ Features:
+  * Small C+ based compiler with structs, floats and other ANSI extensions
+  * Module assembler/linker which only includes required library routines
+  * Peephole optimizer with rulesets that reduce the size of generated code
+    by ~30% and improve speed
+  * Easily retargetted C library including stdio routines
+  * Retargettable VT100 terminal
+  * Support for over a 25 z80 based machines (see below for details)
+Templates:
+ Template: z88dk/configure-defaultpackage
+ Type: select
+ Choices: abc800, abc80, aceansi, aquansi, aquarius, c128ansi, cpcansi, cpc, cpm, embedded, m5, msx, mzansi, mz, nasansi, nascom, nc, newbrain, ozansi, ppsansi, pps, rcmx000, rex, rexlib, samansi, sam, sms, svi, test, ti82ansi, ti82, ti83ansi, ti83, ti85ansi, ti85, ti86ansi, ti86, ti8xansi, ti8x, ts2068ansi, ts2068, vzansi, vz, z88ansi, z88, z88net, zcc, zx81ansi, zx81, zxansi, zx
+ Default: z88
+ _Description: Default z88dk target:
+Config: bash
+ set -e
+ db_input medium z88dk/configure-defaultpackage || true
+ db_go
+Postinst: bash
+ db_get z88dk/configure-defaultpackage
+ pack=$RET
+ if [ -e /usr/share/z88dk/lib/config/$pack.cfg ]; then
+    rm -f /usr/share/z88dk/lib/config/zcc.cfg;
+    ln -s /usr/share/z88dk/lib/config/$pack.cfg /usr/share/z88dk/lib/config/zcc.cfg
+ fi
+Postrm: bash
+ rm -f /usr/share/z88dk/lib/config/zcc.cfg
+
--- z88dk-1.8.ds1.orig/debian/control
+++ z88dk-1.8.ds1/debian/control
@@ -0,0 +1,58 @@
+Source: z88dk
+Maintainer: Krystian Wlosek <kwlosek@gmail.com>
+Uploaders: Piotr Roszatycki <dexter@debian.org>
+Section: devel
+Priority: extra
+Standards-Version: 3.8.3
+Build-Depends: po-debconf, patch, yada
+
+Package: z88dk-bin
+Architecture: any
+Depends: z88dk-data (>= ${binary:Version}), ${z88dk-bin:Depends}
+Description: executable files for z88dk
+ z88dk is a Z80 processor cross compiler producing binaries for over
+ 25 different z80 based machines. This package contains binary files.
+
+Package: z88dk-doc
+Architecture: all
+Section: doc
+Provides: z88dk-examples
+Conflicts: z88dk-examples
+Replaces: z88dk-examples
+Description: documentation and examples for z88dk
+ This is documentation for z88dk compilers. Also example programs with sources
+ are available. See the z88dk package for more details.
+
+Package: z88dk-data
+Architecture: all
+Depends: ${z88dk-data:Depends}
+Replaces: z88dk
+Description: data files for z88dk
+ This package contains any data files needed by z88dk tools.
+
+Package: z88dk
+Architecture: any
+Depends: z88dk-bin (>= ${binary:Version}), z88dk-data (>= ${binary:Version}), debconf
+Suggests: z88dk-doc, z88dk-examples
+Description: a Z80 processor assembler and SmallC+ cross compiler
+ z88dk is a SmallC+ and Z80 assemler cross compiler supplied with an
+ assembler/linker and a set of libraries implementing the C standard library
+ for a number of different z80 based machines. The name z88dk originates from
+ the time when the project was founded and supported only the Cambridge
+ z88 portable.
+ .
+ Supported machines:
+ Cambridge Computers z88, Sinclair ZX Spectrum, Sinclair ZX81, CP/M based
+ machines, Amstrad NC100, VZ200/300, Sharp MZ series, TI calculators (TI82,
+ TI83, TI83+, TI85, TI86), ABC80, Jupiter Ace, Xircom REX 6000, Peters
+ Sprinter, Sam Coupe, MSX1, Spectravideo, Mattel Aquarius, Peters Sprinter,
+ and C128 (in z80 mode) machines.
+ .
+ Features:
+  * Small C+ based compiler with structs, floats and other ANSI extensions
+  * Module assembler/linker which only includes required library routines
+  * Peephole optimizer with rulesets that reduce the size of generated code
+    by ~30% and improve speed
+  * Easily retargetted C library including stdio routines
+  * Retargettable VT100 terminal
+  * Support for over a 25 z80 based machines (see below for details)
--- z88dk-1.8.ds1.orig/debian/templates
+++ z88dk-1.8.ds1/debian/templates
@@ -0,0 +1,6 @@
+Template: z88dk/configure-defaultpackage
+Type: select
+Choices: abc800, abc80, aceansi, aquansi, aquarius, c128ansi, cpcansi, cpc, cpm, embedded, m5, msx, mzansi, mz, nasansi, nascom, nc, newbrain, ozansi, ppsansi, pps, rcmx000, rex, rexlib, samansi, sam, sms, svi, test, ti82ansi, ti82, ti83ansi, ti83, ti85ansi, ti85, ti86ansi, ti86, ti8xansi, ti8x, ts2068ansi, ts2068, vzansi, vz, z88ansi, z88, z88net, zcc, zx81ansi, zx81, zxansi, zx
+Default: z88
+_Description: Default z88dk target:
+
--- z88dk-1.8.ds1.orig/debian/rules
+++ z88dk-1.8.ds1/debian/rules
@@ -0,0 +1,466 @@
+#!/usr/bin/make -f
+# Generated automatically from debian/packages
+# by yada v0.55, of Tue, 15 Dec 2009
+
+DEB_HOST_ARCH        := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
+DEB_HOST_ARCH_OS     := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+DEB_HOST_ARCH_CPU    := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_GNU_CPU     := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU 2>/dev/null)
+DEB_HOST_GNU_TYPE    := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2>/dev/null)
+DEB_HOST_GNU_SYSTEM  := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
+
+DEB_BUILD_ARCH       := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
+DEB_BUILD_ARCH_OS    := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
+DEB_BUILD_ARCH_CPU   := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
+DEB_BUILD_GNU_CPU    := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU 2>/dev/null)
+DEB_BUILD_GNU_TYPE   := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2>/dev/null)
+DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM 2>/dev/null)
+
+# Take account of old dpkg-architecture output.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
+  ifeq ($(DEB_HOST_ARCH_CPU),i486)
+    DEB_HOST_ARCH_OS := i386
+  else
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_OS := amd64
+  endif
+  endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+  DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
+  ifeq ($(DEB_HOST_ARCH_OS),gnu)
+    DEB_HOST_ARCH_OS := hurd
+  endif
+endif
+ifeq ($(DEB_BUILD_ARCH_CPU),)
+  DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
+  ifeq ($(DEB_BUILD_ARCH_CPU),i486)
+    DEB_BUILD_ARCH_OS := i386
+  else
+  ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
+    DEB_BUILD_ARCH_OS := amd64
+  endif
+  endif
+endif
+ifeq ($(DEB_BUILD_ARCH_OS),)
+  DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
+  ifeq ($(DEB_BUILD_ARCH_OS),gnu)
+    DEB_BUILD_ARCH_OS := hurd
+  endif
+endif
+
+LEFT_PARENTHESIS:=(
+VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]* $(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
+
+SHELL=/bin/bash
+
+.PHONY: default
+default:
+	@echo "Specify a target:"; \
+	echo " build              compile the package"; \
+	echo " build-arch         compile the architecture-dependent package"; \
+	echo " build-indep        compile the architecture-independent package"; \
+	echo " binary             make all binary packages"; \
+	echo " binary-arch        make all architecture-dependent binary packages"; \
+	echo " binary-indep       make all architecture-independent binary packages"; \
+	echo " clean              clean up the source package"; \
+	echo; \
+	echo " clean-install-tree clean up only under debian/"; \
+	echo
+
+# Build the package and prepare the install tree
+
+.PHONY: build-only build
+build-only: debian/build-stamp
+build: build-only
+
+.PHONY: build-arch-only build-arch
+build-arch-only: debian/build-arch-stamp
+build-arch: build-arch-only
+
+.PHONY: build-indep-only build-indep
+build-indep-only: debian/build-indep-stamp
+build-indep: build-indep-only
+
+# Make sure these rules and the control file are up-to-date
+
+.PHONY: rules control templates
+rules: debian/rules
+debian/rules: $(shell which yada) debian/packages-tmp
+	yada rebuild rules
+
+control: debian/control
+debian/control: $(shell which yada) debian/packages-tmp
+	yada rebuild control
+
+templates: debian/templates debian/po/POTFILES.in
+debian/templates: $(shell which yada) debian/packages-tmp
+	yada rebuild templates
+debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
+	yada rebuild templates
+
+debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	yada patch "debian/patches/*.diff"
+	touch debian/build-stamp
+
+debian/build-arch-stamp:
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	yada patch "debian/patches/*.diff"
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'rm -rf bin usr';\
+	echo -E 'mkdir -p bin usr';\
+	echo -E 'export CC="gcc"';\
+	echo -E 'export CFLAGS="-g -O2 -Wall"';\
+	echo -E 'make -e prefix=/usr') | /bin/bash
+	touch debian/build-arch-stamp
+
+debian/build-indep-stamp: debian/build-arch-stamp
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	yada patch "debian/patches/*.diff"
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'export Z80_OZFILES=$$(pwd)/lib/';\
+	echo -E 'export ZCCCFG=$$(pwd)/lib/config/';\
+	echo -E '# create symlink';\
+	echo -E 'pushd $$(pwd)/include; ln -vs x11 X11; popd';\
+	echo -E 'PATH=$$(pwd)/bin:$$PATH make -C $$(pwd)/libsrc') | /bin/bash
+	touch debian/build-indep-stamp
+
+.PHONY: install-tree
+install-tree: install-tree-any
+install-tree-any: \
+	debian/tmp-z88dk-bin/DEBIAN/control \
+	debian/tmp-z88dk-doc/DEBIAN/control \
+	debian/tmp-z88dk-data/DEBIAN/control \
+	debian/tmp-z88dk/DEBIAN/control
+
+debian/tmp-z88dk-bin/DEBIAN/control: debian/build-arch-stamp debian/control
+	rm -rf debian/tmp-z88dk-bin
+	umask 022 && install -d debian/tmp-z88dk-bin/DEBIAN
+	install -d debian/tmp-z88dk-bin/usr/share/doc/z88dk-bin
+	umask 022; yada generate copyright z88dk-bin \
+	  > debian/tmp-z88dk-bin/usr/share/doc/z88dk-bin/copyright
+	install -m 644 -p debian/changelog \
+	  debian/tmp-z88dk-bin/usr/share/doc/z88dk-bin/changelog.Debian
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-bin" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-bin/DEBIAN" \
+	  && export PACKAGE="z88dk-bin" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada copy -bin bin/*';\
+	echo -E 'APPS="zcc appmake copt sccz80 z80asm zcpp"';\
+	echo -E 'PREFIX="z88dk-"';\
+	echo -E 'for a in $$APPS; do';\
+	echo -E '   mv -v $$ROOT/usr/bin/$$a $$ROOT/usr/bin/$${PREFIX}$$a';\
+	echo -E 'done';\
+	echo -E 'yada install -man debian/manpages/zcc.1 -as z88dk-zcc.1';\
+	echo -E 'yada symlink -man z88dk-zcc.1 -as zcc.1';\
+	echo -E 'yada install -man debian/manpages/appmake.1 -as z88dk-appmake.1';\
+	echo -E 'yada symlink -man z88dk-appmake.1 -as appmake.1';\
+	echo -E 'yada install -man debian/manpages/copt.1 -as z88dk-copt.1';\
+	echo -E 'yada symlink -man z88dk-copt.1 -as copt.1';\
+	echo -E 'yada install -man debian/manpages/z80asm.1 -as z88dk-z80asm.1';\
+	echo -E 'yada symlink -man  z88dk-zcc.1 -as z88dk-sccz80.1';\
+	echo -E 'yada symlink -man  z88dk-zcc.1 -as sccz80.1';\
+	echo -E 'yada symlink -into /usr/lib /usr/share/z88dk') | /bin/sh
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-bin" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-bin/DEBIAN" \
+	  && export PACKAGE="z88dk-bin" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada perl';\
+	echo -E 'yada python';\
+	echo -E 'yada strip';\
+	echo -E 'yada shlibdeps') | /bin/sh
+	yada compress z88dk-bin
+	yada generate maintscripts z88dk-bin
+	find debian/tmp-z88dk-bin -type f -print \
+	  | sed -n 's/^debian\/tmp-z88dk-bin\(\/etc\/.*\)$$/\1/p' \
+	  > debian/tmp-z88dk-bin/DEBIAN/conffiles
+	test -s debian/tmp-z88dk-bin/DEBIAN/conffiles || rm -f debian/tmp-z88dk-bin/DEBIAN/conffiles
+	yada rebuild control
+	yada generate substvars z88dk-bin
+	umask 022 && dpkg-gencontrol -isp -pz88dk-bin -Pdebian/tmp-z88dk-bin
+
+debian/tmp-z88dk-doc/DEBIAN/control: debian/build-indep-stamp debian/control
+	rm -rf debian/tmp-z88dk-doc
+	umask 022 && install -d debian/tmp-z88dk-doc/DEBIAN
+	install -d debian/tmp-z88dk-doc/usr/share/doc/z88dk-doc
+	umask 022; yada generate copyright z88dk-doc \
+	  > debian/tmp-z88dk-doc/usr/share/doc/z88dk-doc/copyright
+	install -m 644 -p debian/changelog \
+	  debian/tmp-z88dk-doc/usr/share/doc/z88dk-doc/changelog.Debian
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-doc" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-doc/DEBIAN" \
+	  && export PACKAGE="z88dk-doc" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada copy -doc -subdir doc doc/*';\
+	echo -E '#no strange manpages yet';\
+	echo -E 'rm -rf $$ROOT/usr/share/doc/$$PACKAGE/doc/netman';\
+	echo -E '#fix perms';\
+	echo -E 'find $$ROOT/usr/share/doc/$$PACKAGE/doc -type d -exec chmod 755 {} \;';\
+	echo -E 'find $$ROOT/usr/share/doc/$$PACKAGE/doc -type f -exec chmod 644 {} \;';\
+	echo -E '# merged with -examples';\
+	echo -E 'yada copy -doc -subdir examples examples/*';\
+	echo -E '#fix perms';\
+	echo -E 'find $$ROOT/usr/share/doc/$$PACKAGE/examples -type d -exec chmod 755 {} \;';\
+	echo -E 'find $$ROOT/usr/share/doc/$$PACKAGE/examples -type f -exec chmod 644 {} \;') | /bin/sh
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-doc" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-doc/DEBIAN" \
+	  && export PACKAGE="z88dk-doc" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada perl';\
+	echo -E 'yada python';\
+	echo -E 'yada strip';\
+	echo -E 'yada shlibdeps') | /bin/sh
+	yada compress z88dk-doc
+	yada generate maintscripts z88dk-doc
+	find debian/tmp-z88dk-doc -type f -print \
+	  | sed -n 's/^debian\/tmp-z88dk-doc\(\/etc\/.*\)$$/\1/p' \
+	  > debian/tmp-z88dk-doc/DEBIAN/conffiles
+	test -s debian/tmp-z88dk-doc/DEBIAN/conffiles || rm -f debian/tmp-z88dk-doc/DEBIAN/conffiles
+	yada rebuild control
+	yada generate substvars z88dk-doc
+	umask 022 && dpkg-gencontrol -isp -pz88dk-doc -Pdebian/tmp-z88dk-doc
+
+debian/tmp-z88dk-data/DEBIAN/control: debian/build-indep-stamp debian/control
+	rm -rf debian/tmp-z88dk-data
+	umask 022 && install -d debian/tmp-z88dk-data/DEBIAN
+	install -d debian/tmp-z88dk-data/usr/share/doc/z88dk-data
+	umask 022; yada generate copyright z88dk-data \
+	  > debian/tmp-z88dk-data/usr/share/doc/z88dk-data/copyright
+	install -m 644 -p debian/changelog \
+	  debian/tmp-z88dk-data/usr/share/doc/z88dk-data/changelog.Debian
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-data" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-data/DEBIAN" \
+	  && export PACKAGE="z88dk-data" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'export Z80_OZFILES=$$(pwd)/lib/';\
+	echo -E 'export ZCCCFG=$$(pwd)/lib/config/';\
+	echo -E '#PATH=$$(pwd)/bin:$$PATH make -C $$(pwd)/libsrc';\
+	echo -E 'PATH=$$(pwd)/bin:$$PATH make -C $$(pwd)/libsrc install';\
+	echo -E 'make prefix=/usr DESTDIR=$$ROOT install';\
+	echo -E '# no executable files';\
+	echo -E 'rm -rf $$ROOT/usr/bin';\
+	echo -E '# no default config';\
+	echo -E 'rm -f $$ROOT/usr/share/z88dk/lib/config/zcc.cfg';\
+	echo -E 'rm -f $$ROOT/usr/share/z88dk/lib/config/*.lnx';\
+	echo -E 'for i in $$ROOT/usr/share/z88dk/lib/config/*.cfg; do echo "file: $$i";';\
+	echo -E '   mv $$i $$i.tmp; cat $$i.tmp | \';\
+	echo -E '   sed '\''s/^Z80EXE.*$$/Z80EXE\t\tz88dk-z80asm/g'\'' | sed '\''s/^CPP.*$$/CPP\t\tz88dk-zcpp/g'\'' | \';\
+	echo -E '   sed '\''s/^LINKER.*$$/LINKER\t\tz88dk-z80asm/g'\'' | sed '\''s/^COMPILER.*$$/COMPILER\tz88dk-sccz80/g'\'' | \';\
+	echo -E '   sed '\''s/^COPTEXE.*$$/COPTEXE\t\tz88dk-copt/g'\'' | sed '\''s/^APPMAKER.*$$/APPMAKER\tz88dk-appmake/g'\'' > $$i;';\
+	echo -E '    rm $$i.tmp;';\
+	echo -E 'done';\
+	echo -E 'yada install -doc EXTENSIONS README.1st';\
+	echo -E 'yada install -man debian/manpages/z88dk.1') | /bin/bash
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk-data" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk-data/DEBIAN" \
+	  && export PACKAGE="z88dk-data" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada perl';\
+	echo -E 'yada python';\
+	echo -E 'yada strip';\
+	echo -E 'yada shlibdeps') | /bin/sh
+	yada compress z88dk-data
+	yada generate maintscripts z88dk-data
+	find debian/tmp-z88dk-data -type f -print \
+	  | sed -n 's/^debian\/tmp-z88dk-data\(\/etc\/.*\)$$/\1/p' \
+	  > debian/tmp-z88dk-data/DEBIAN/conffiles
+	test -s debian/tmp-z88dk-data/DEBIAN/conffiles || rm -f debian/tmp-z88dk-data/DEBIAN/conffiles
+	yada rebuild control
+	yada generate substvars z88dk-data
+	umask 022 && dpkg-gencontrol -isp -pz88dk-data -Pdebian/tmp-z88dk-data
+
+debian/tmp-z88dk/DEBIAN/control: debian/build-arch-stamp debian/control
+	rm -rf debian/tmp-z88dk
+	umask 022 && install -d debian/tmp-z88dk/DEBIAN
+	install -d debian/tmp-z88dk/usr/share/doc/z88dk
+	umask 022; yada generate copyright z88dk \
+	  > debian/tmp-z88dk/usr/share/doc/z88dk/copyright
+	install -m 644 -p debian/changelog \
+	  debian/tmp-z88dk/usr/share/doc/z88dk/changelog.Debian
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export ROOT="$$(pwd)/debian/tmp-z88dk" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export CONTROL="$$(pwd)/debian/tmp-z88dk/DEBIAN" \
+	  && export PACKAGE="z88dk" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'yada perl';\
+	echo -E 'yada python';\
+	echo -E 'yada strip';\
+	echo -E 'yada shlibdeps') | /bin/sh
+	yada compress z88dk
+	yada generate maintscripts z88dk
+	find debian/tmp-z88dk -type f -print \
+	  | sed -n 's/^debian\/tmp-z88dk\(\/etc\/.*\)$$/\1/p' \
+	  > debian/tmp-z88dk/DEBIAN/conffiles
+	test -s debian/tmp-z88dk/DEBIAN/conffiles || rm -f debian/tmp-z88dk/DEBIAN/conffiles
+	yada rebuild control
+	yada generate substvars z88dk
+	umask 022 && dpkg-gencontrol -isp -pz88dk -Pdebian/tmp-z88dk
+
+# Build package files
+
+.PHONY: binary binary-arch binary-indep
+binary: binary-arch binary-indep
+binary-arch: binary-arch-any
+
+.PHONY: binary-arch-any
+binary-arch-any: \
+	binary-package-z88dk-bin \
+	binary-package-z88dk
+binary-indep: \
+	binary-package-z88dk-doc \
+	binary-package-z88dk-data
+
+.PHONY: binary-package-z88dk-bin
+binary-package-z88dk-bin: check-root debian/tmp-z88dk-bin/DEBIAN/control
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	chown -R 0.0 debian/tmp-z88dk-bin
+	chmod -R u=rwX,go=rX debian/tmp-z88dk-bin
+	@if [ -d debian/tmp-z88dk-bin/usr/doc/z88dk-bin ]; then \
+	  echo "*** Yada warning: /usr/doc/z88dk-bin should be /usr/share/doc/z88dk-bin";\
+	fi
+	dpkg-deb --build debian/tmp-z88dk-bin ..
+
+.PHONY: binary-package-z88dk-doc
+binary-package-z88dk-doc: check-root debian/tmp-z88dk-doc/DEBIAN/control
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	chown -R 0.0 debian/tmp-z88dk-doc
+	chmod -R u=rwX,go=rX debian/tmp-z88dk-doc
+	@if [ -d debian/tmp-z88dk-doc/usr/doc/z88dk-doc ]; then \
+	  echo "*** Yada warning: /usr/doc/z88dk-doc should be /usr/share/doc/z88dk-doc";\
+	fi
+	dpkg-deb --build debian/tmp-z88dk-doc ..
+
+.PHONY: binary-package-z88dk-data
+binary-package-z88dk-data: check-root debian/tmp-z88dk-data/DEBIAN/control
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	chown -R 0.0 debian/tmp-z88dk-data
+	chmod -R u=rwX,go=rX debian/tmp-z88dk-data
+	@if [ -d debian/tmp-z88dk-data/usr/doc/z88dk-data ]; then \
+	  echo "*** Yada warning: /usr/doc/z88dk-data should be /usr/share/doc/z88dk-data";\
+	fi
+	dpkg-deb --build debian/tmp-z88dk-data ..
+
+.PHONY: binary-package-z88dk
+binary-package-z88dk: check-root debian/tmp-z88dk/DEBIAN/control
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	chown -R 0.0 debian/tmp-z88dk
+	chmod -R u=rwX,go=rX debian/tmp-z88dk
+	@if [ -d debian/tmp-z88dk/usr/doc/z88dk ]; then \
+	  echo "*** Yada warning: /usr/doc/z88dk should be /usr/share/doc/z88dk";\
+	fi
+	dpkg-deb --build debian/tmp-z88dk ..
+
+.PHONY: check-root
+check-root:
+	@[ `id -u` = 0 ] || (echo "You must be root to do this!"; false)
+
+debian/packages-tmp: debian/packages 
+	yada rebuild packages
+
+## Clean up afterwards
+
+.PHONY: clean clean-install-tree clean-build
+
+clean: clean-install-tree clean-build debian/control debian/rules
+	rm -f debian/packages-tmp debian/packages-tmp-new debian/packages-tmp-include
+
+clean-build:
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	rm -f debian/build-stamp debian/build-arch-stamp debian/build-indep-stamp
+	@umask 022 \
+	  && export pwd="$$(pwd)" \
+	  && export TMPROOT="$$(pwd)/debian/tmp" \
+	  && export SOURCE="z88dk" \
+	  && export VERSION="$(VERSION)" \
+	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
+	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
+	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
+	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
+	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
+	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
+	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
+	echo -E 'rm -rf bin usr src/config.h libsrc/debug/zcc_opt.def libsrc/graphics/x11/zcc_opt.def include/X11';\
+	echo -E 'make clean || true') | /bin/sh
+	yada unpatch
+	rm -rf debian/tmp
+
+clean-install-tree: debian/rules
+	@[ -f $(shell which yada) -a -f debian/rules ]
+	rm -f debian/install-tree-stamp
+	rm -rf debian/tmp-* debian/files* debian/substvars debian/shlibs.local debian/ucf
--- z88dk-1.8.ds1.orig/debian/changelog
+++ z88dk-1.8.ds1/debian/changelog
@@ -0,0 +1,168 @@
+z88dk (1.8.ds1-7) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * Apply patch for 64bit architectures. Remove -m32 flag from LDFLAGS.
+    (Closes: #570681)
+  * Added Spanish defconf translation. (Closes: #578350)
+    Patch by Ricardo Fraile.
+
+ -- Krystian Wlosek <kwlosek@gmail.com>  Thu, 22 Apr 2010 15:13:27 +0100
+
+z88dk (1.8.ds1-6) unstable; urgency=high
+
+  [ Krystian Wlosek ]
+  * Change maintainer email from tygrys@waw.pdi.net to kwlosek@gmail.com
+  * Build-Depends: change freebsd-amd64 to kfreebsd-amd64 (Closes: #537084)
+    Thanks to Petr Salinger
+  * Fixed FTBFS problem with src/z80asm/z80pass.c (Closes: #552886)
+    Added patch debian/patches/05_src_z80asm_z80pass.c.diff
+    Thanks to Lucas Nussbaum
+  * Bump standards version to 3.8.3. No changes needed.
+
+ -- Krystian Wlosek <kwlosek@gmail.com>  Tue, 01 Dec 2009 22:41:10 +0100
+
+z88dk (1.8.ds1-5) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * Added Japanese debconf translation. (Closes: #512868)
+    Patch by Hideki Yamane.
+  * Added Russian debconf translation. (Closes: #514508)
+    Patch by Yuri Kozlov.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Tue, 23 Feb 2009 11:10:17 +0100
+
+z88dk (1.8.ds1-4) unstable; urgency=low
+
+  * Fixed problem with CPC binaries (Closes: #475605)
+    Added patch debian/patches/02_lib_cpc_crt0.asm.diff
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Thu, 17 Oct 2008 11:45:12 +0200
+
+z88dk (1.8.ds1-3) unstable; urgency=low
+
+  * Added Swedish debconf translation. (Closes: #500127)
+    Patch by Martin Bagge.
+  * Bump standards version to 3.8.0. Added 'set -e' in config scripts.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Wed, 15 Oct 2008 14:28:51 +0200
+
+z88dk (1.8.ds1-2) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * Enable 64bit architecture.
+  * Added '-m32' switch to CFLAGS and LDFLAGS for 64bit machines.
+  * Changed Architecture: to `any' in z88dk and z88dk-bin package.
+  * Added gcc-multilib to Build-Depends: for 64bit
+  * Fixed problem with x11.lib
+    - created symlink from include/x11 to include/X11
+    - improved Makefile for x11.lib
+      patch debian/patches/03_libsrc_graphics_x11_Makefile.diff
+  * Fixed library ozansi.lib
+    - patch debian/patches/03_libsrc_oz_ozinput_Makefile.diff
+  * Changed Copyright notice.
+  * Fixed gcc warnings:
+    - in src/appmake dir - debian/patches/04_src_appmake.diff
+    - in src/zcc/zcc.c - debian/patches/04_src_zcc_zcc.c.diff
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Tue, 25 Mar 2008 11:46:11 +0100
+
+z88dk (1.8.ds1-1) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * New upstream release.
+  * Added missing arch: armel armeb to z88dk. Thanks to Martin Guy.
+    Closes: #469967
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Mon, 10 Mar 2008 11:01:25 +0100
+
+z88dk (1.7.ds1-2) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * Added Dutch debconf translation. (Closes: #449401)
+    Patch by Bart 'cobaco' Cornelis.
+  * Added missing libraries: malloc.lib, mzx.lib, mzx_tiny.lib
+    z88_math.lib and make propper diff files.
+    Thanks to Josetxu Malanda.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Wed, 27 Feb 2008 11:56:25 +0100
+
+z88dk (1.7.ds1-1) unstable; urgency=low
+
+  [ Krystian Wlosek ]
+  * New upstream release.
+    Closes: #438984
+  * Added missing colon to close bug 435364
+
+  [ Piotr Roszatycki ]
+  * Changed section for z88dk-doc package.
+  * Standards-Version: 3.7.3
+
+ -- Piotr Roszatycki <dexter@debian.org>  Mon, 07 Jan 2008 13:35:53 +0100
+
+z88dk (1.6.ds1-7) unstable; urgency=low
+
+  * Added Portuguese debconf translation. (Closes: #434194)
+    Thanks to Americo Monteiro.
+  * Added armel and armeb to z88dk-bin/Architecture: (Closes: #435364)
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Mon, 27 Aug 2007 12:35:28 +0200
+
+z88dk (1.6.ds1-6) unstable; urgency=low
+
+  * Added forgotten Replaces: in z88dk-data.
+    Thanks to Mark Robinson <mark@zl2tod.net> (Closes: #423475)
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Tue, 14 May 2007 15:37:20 +0200
+
+z88dk (1.6.ds1-5) unstable; urgency=low
+
+  * New package z88dk-data with non-arch specific files.
+  * Added hurd and m68k to z88dk-bin/Architecture.
+  * Added German debconf translation. (Closes: #408650)
+    Patch by Helge Kreutzmann <debian@helgefjell.de>.
+  * Changed Architecture for z88dk from 'all' to this same as in z88dk-bin.
+  * Moved files of z88dk-examples to z88dk-doc.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Tue,  8 May 2007 15:37:20 +0200
+
+z88dk (1.6.ds1-4) unstable; urgency=low
+
+  * s390 is 32bit archtecture. Closes: #405013, #405264
+    Thanks to Bastian Blank, Steve Langasek.
+  * arm already added to z88dk-bin/Architecture:
+    Thanks to Steve Langasek.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Mon,  8 Jan 2007 09:42:21 +0100
+
+z88dk (1.6.ds1-3) unstable; urgency=low
+
+  * Recompile with new yada without templates problems.
+  * Added missing arm architecture
+  * Added exit in build script when buildd try compile for
+    64bit architectures: s390,alpha,amd64,ia64,ppc64 (Closes: #395263)
+  * Added Czech debconf translation (Closes: #402985)
+    Thanks to Jakub Kasparec.
+  * conflict with z80asm package. z88dk-bin overwrite manpage in z80asm
+    symlink from z88dk-z80asm.1 to z80asm.1 removed.
+    Thanks to Michael Ablassmeier, (Closes: #404012)
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Thu, 21 Dec 2006 09:24:10 +0100
+
+z88dk (1.6.ds1-2) unstable; urgency=low
+
+  * Fixed typo and bullet lists in long description. (Closes: #395997)
+    Patch by Guillem Jover.
+  * z88dk-bin depends on libc6. Thanks to Guillem Jover. (Closes: #395998)
+  * Circular dependency fixed. Thanks to Bill Allombert. (Closes: #396213)
+  * Added French debconf translation. (Closes: #397102)
+    Patch by Steve <dlist@bluewin.ch>.
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Mon, 13 Nov 2006 14:49:28 +0100
+
+z88dk (1.6.ds1-1) unstable; urgency=low
+
+  * Initial Debian version.
+  * ITP was done, Closes: #224723
+  * 64bit architecture are off
+
+ -- Krystian Wlosek <tygrys@waw.pdi.net>  Wed, 26 Sep 2006 12:42:14 +0200
--- z88dk-1.8.ds1.orig/debian/README.Debian-source
+++ z88dk-1.8.ds1/debian/README.Debian-source
@@ -0,0 +1,12 @@
+* Repackage upstream source:
+Version 1.8:
+  - remove binary files
+  - remove CVS directories
+
+Version 1.7:
+  - remove binary files
+  - remove bin/ directory
+
+Version 1.6:
+  - remove CVS directories
+  - remove binary files
--- z88dk-1.8.ds1.orig/debian/manpages/z88dk.1.txt
+++ z88dk-1.8.ds1/debian/manpages/z88dk.1.txt
@@ -0,0 +1,33 @@
+NAME
+  z88dk - The z88 Development Kit.
+
+DESCRIPTION
+
+   The z88 Development Kit (hereafter known as z88dk) is an advanced set
+   of tools allowing the production of complex programs for z80 based
+   computers in either C or assembly language.
+  The name z88dk originates from the time when the project was founded and targetted only the Cambridge z88 portable.
+
+  The compiler featured in z88dk is much enhanced Small C compiler, the compiler accepts many features
+  of ANSI C and is only deficient in a few areas where implementation on a z80 processor might prove
+  inefficient. The compiler performs simple optimizations, but the bulk of the optimization is done by
+  a set of peep-hole rules, which will typically reduce the size of a large project by up to a third.
+
+  The libraries supplied with z88dk are designed to be as generic as possible, indeed it is possible
+  to port to a new machine simply by supplying two library routines and some startup code. It is hoped
+  that one day z88dk will support as many z80 based machines as there is information available and sufficient interest in. 
+
+  z88dk contains usable tools:
+  o zcc - the frontend of z88dk is called zcc, it is this that you should call if you want to do any compilations.
+  o z80asm - Z80 assembler compiler
+  o copt - Z80 asm optimizer code
+  o appmake - produce files which are suitable for use in emulators or on the real hardware
+  o sccz80 - Small-C/Plus compiler
+
+SEE ALSO
+  z88dk(1), z88dk-zcc(1), z88dk-z80asm(1), z88dk-appmake(1), z88dk-copt(1).
+
+
+AUTHOR
+  z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+  This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/z80asm.1
+++ z88dk-1.8.ds1/debian/manpages/z80asm.1
@@ -0,0 +1,92 @@
+.\"Text automatically generated by txt2man
+.TH z80asm 1 "01 December 2009" "" "z88 Development Kit"
+.SH NAME
+\fBz88dk-z80asm \fP- Z80 assembler compiler.
+.SH SYSNOPIS
+z88dk-z80asm [options] [ @<modulefile> | {<filename>} ]
+.SH DESCRIPTION
+This manual page documents briefly the z88dk tools. This manual page
+was written for the Debian GNU/Linux distribution (but may be used
+by others), because the original program does not have a manual page.
+.PP
+z88dk-z80asm is a Z80 assembler cross compiler.
+.PP
+Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc/ for the complete description of the system.
+If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+.SH OPTIONS
+.TP
+.B
+\fB-h\fP
+display help
+.TP
+.B
+\fB-n\fP
+defines option to be turned OFF (except \fB-r\fP \fB-R\fP \fB-i\fP \fB-x\fP \fB-D\fP \fB-t\fP \fB-o\fP)
+.TP
+.B
+\fB-v\fP
+verbose
+.TP
+.B
+\fB-l\fP
+listing file
+.TP
+.B
+\fB-s\fP
+symbol table,
+.TP
+.B
+\fB-m\fP
+map listing file
+.TP
+.B
+\fB-r\fP<ORG>
+Explicit relocation <ORG> defined in hex (ignore ORG in first module)
+.TP
+.B
+\fB-plus\fP
+Interpret 'Invoke' as RST 28h
+.TP
+.B
+\fB-R\fP
+Generate relocatable code (Automatical relocation before execution)
+.TP
+.B
+\fB-D\fP<symbol>
+define symbol as logically TRUE (used for conditional assembly)
+.TP
+.B
+\fB-b\fP
+assemble files & link to ORG address. \fB-c\fP split code in 16K banks
+.TP
+.B
+\fB-d\fP
+date stamp control, assemble only if source file > object file
+\fB-a\fP: \fB-b\fP & \fB-d\fP (assemble only updated source files, then link & relocate)
+.TP
+.B
+\fB-o\fP<bin filename>
+expl. output filename, \fB-g\fP XDEF reloc. addr. from all modules
+.TP
+.B
+\fB-i\fP<library>
+include <library> LIB modules with .obj modules during linking
+.TP
+.B
+\fB-x\fP<library>
+create library from specified modules ( e.g. with @<modules> )
+.TP
+.B
+\fB-t\fP<n>
+tabulator width for .map, .def, .sym files. Column width is 4 times \fB-t\fP
+.PP
+Default options: \fB-nv\fP \fB-nd\fP \fB-nb\fP \fB-nl\fP \fB-s\fP \fB-m\fP \fB-ng\fP \fB-nc\fP \fB-nR\fP \fB-t8\fP
+.SH SEE ALSO
+\fBz88dk\fP(1), \fBz88dk-zcc\fP(1), \fBz88dk-z80asm\fP(1), \fBz88dk-appmake\fP(1), \fBz88dk-copt\fP(1).
+.RE
+.PP
+
+.SH AUTHOR
+z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+z80asm was written by Gunther Strube <gbs@image.dk>.
+This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/copt.1.txt
+++ z88dk-1.8.ds1/debian/manpages/copt.1.txt
@@ -0,0 +1,63 @@
+NAME
+  copt - peephole optimizer
+SYSNOPIS
+  copt file ...
+DESCRIPTION
+  copt is a general-purpose peephole optimizer. It reads
+  code from its standard input and writes an improved version to its standard output. 
+  copy reads the named files for its optimizations, which are encoded as follows:
+  
+          <pattern for input line 1>
+          <pattern for input line 2>
+           ...
+          <pattern for input line n>
+          =
+          <pattern for output line 1>
+          <pattern for output line 2>
+           ...
+          <pattern for output line m>
+          <blank line>
+
+  Pattern matching uses literal string comparison, with one
+  exception: ``%%'' matches the ``%'' character, and ``%''
+  followed by a digit matches everything up to the next
+  occurrence of the next pattern character, though all
+  occurrences of %\fIn\fP must denote the same string. For example,
+  the pattern ``%1=%1.'' matches exactly those strings
+  that begin with a string X, followed by a ``='' (the
+  first), followed by a second occurrence of X, followed by
+  a period. In this way, the input/output pattern
+
+          mov $%1,r%2
+          mov *r%2,r%2
+          =
+          mov %1,r%2
+
+  commands copt to replace runs like
+
+          mov $_a,r3
+          mov *r3,r3
+
+  with
+
+          mov _a,r3
+
+  Note that a tab or newline can terminate a %\fBn\fP variable.
+
+  copt compares each run of input patterns with the current
+  input instruction and its predecessors. If no match is
+  found, it advances to the next input instruction and tries
+  again. Otherwise, it replaces the input instructions with
+  the corresponding output patterns, pattern variables
+  instantiated,and resumes its search with the \fIfirst\fP
+  instruction of the replacement. copt matches input patterns
+  in reverse order to cascade optimizations without
+  backing up.
+
+BUGS
+  Errors in optimization files are always possible.
+SEE ALSO
+  z88dk(1), z88dk-zcc(1), z88dk-z80asm(1), z88dk-appmake(1), z88dk-copt(1).
+
+AUTHOR
+  z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
--- z88dk-1.8.ds1.orig/debian/manpages/z80asm.1.txt
+++ z88dk-1.8.ds1/debian/manpages/z80asm.1.txt
@@ -0,0 +1,44 @@
+NAME
+  z88dk-z80asm - Z80 assembler compiler.
+SYSNOPIS
+  z88dk-z80asm [options] [ @<modulefile> | {<filename>} ]
+
+DESCRIPTION
+  This manual page documents briefly the z88dk tools. This manual page
+  was written for the Debian GNU/Linux distribution (but may be used
+  by others), because the original program does not have a manual page.
+
+  z88dk-z80asm is a Z80 assembler cross compiler.
+
+  Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc/ for the complete description of the system.
+  If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+
+OPTIONS
+  -h       display help
+  -n       defines option to be turned OFF (except -r -R -i -x -D -t -o)
+  -v       verbose
+  -l       listing file
+  -s       symbol table,
+  -m       map listing file
+  -r<ORG>  Explicit relocation <ORG> defined in hex (ignore ORG in first module)
+  -plus    Interpret 'Invoke' as RST 28h
+  -R       Generate relocatable code (Automatical relocation before execution)
+  -D<symbol>   define symbol as logically TRUE (used for conditional assembly)
+  -b       assemble files & link to ORG address. -c split code in 16K banks
+  -d       date stamp control, assemble only if source file > object file
+  -a: -b & -d (assemble only updated source files, then link & relocate)
+  -o<bin filename>     expl. output filename, -g XDEF reloc. addr. from all modules
+  -i<library>       include <library> LIB modules with .obj modules during linking
+  -x<library>       create library from specified modules ( e.g. with @<modules> )
+  -t<n>      tabulator width for .map, .def, .sym files. Column width is 4 times -t
+
+  Default options: -nv -nd -nb -nl -s -m -ng -nc -nR -t8
+
+SEE ALSO
+  z88dk(1), z88dk-zcc(1), z88dk-z80asm(1), z88dk-appmake(1), z88dk-copt(1).
+
+
+AUTHOR
+  z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+  z80asm was written by Gunther Strube <gbs@image.dk>.
+  This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/z88dk.1
+++ z88dk-1.8.ds1/debian/manpages/z88dk.1
@@ -0,0 +1,42 @@
+.\"Text automatically generated by txt2man
+.TH z88dk 1 "01 December 2009" "" "z88 Development Kit"
+.SH NAME
+\fBz88dk \fP- The z88 Development Kit.
+\fB
+.SH DESCRIPTION
+
+The z88 Development Kit (hereafter known as z88dk) is an advanced set
+of tools allowing the production of complex programs for z80 based
+computers in either C or assembly language.
+The name z88dk originates from the time when the project was founded and targetted only the Cambridge z88 portable.
+.RE
+.PP
+The compiler featured in z88dk is much enhanced Small C compiler, the compiler accepts many features
+of ANSI C and is only deficient in a few areas where implementation on a z80 processor might prove
+inefficient. The compiler performs simple optimizations, but the bulk of the optimization is done by
+a set of peep-hole rules, which will typically reduce the size of a large project by up to a third.
+.RS
+.PP
+The libraries supplied with z88dk are designed to be as generic as possible, indeed it is possible
+to port to a new machine simply by supplying two library routines and some startup code. It is hoped
+that one day z88dk will support as many z80 based machines as there is information available and sufficient interest in. 
+.PP
+z88dk contains usable tools:
+.IP \(bu 3
+zcc - the frontend of z88dk is called zcc, it is this that you should call if you want to do any compilations.
+.IP \(bu 3
+z80asm - Z80 assembler compiler
+.IP \(bu 3
+copt - Z80 asm optimizer code
+.IP \(bu 3
+appmake - produce files which are suitable for use in emulators or on the real hardware
+.IP \(bu 3
+sccz80 - Small-C/Plus compiler
+.SH SEE ALSO
+\fBz88dk\fP(1), \fBz88dk-zcc\fP(1), \fBz88dk-z80asm\fP(1), \fBz88dk-appmake\fP(1), \fBz88dk-copt\fP(1).
+.RE
+.PP
+
+.SH AUTHOR
+z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/copt.1
+++ z88dk-1.8.ds1/debian/manpages/copt.1
@@ -0,0 +1,79 @@
+.\"Text automatically generated by txt2man
+.TH copt 1 "01 December 2009" "" "z88 Development Kit"
+.SH NAME
+\fBcopt \fP- peephole optimizer
+.SH SYSNOPIS
+copt file \.\.\.
+.SH DESCRIPTION
+copt is a general-purpose peephole optimizer. It reads
+code from its standard input and writes an improved version to its standard output. 
+copy reads the named files for its optimizations, which are encoded as follows:
+.PP
+.nf
+.fam C
+          <pattern for input line 1>
+          <pattern for input line 2>
+           \.\.\.
+          <pattern for input line n>
+          =
+          <pattern for output line 1>
+          <pattern for output line 2>
+           \.\.\.
+          <pattern for output line m>
+          <blank line>
+
+.fam T
+.fi
+Pattern matching uses literal string comparison, with one
+exception: ``%%'' matches the ``%'' character, and ``%''
+followed by a digit matches everything up to the next
+occurrence of the next pattern character, though all
+occurrences of %\fIn\fP must denote the same string. For example,
+the pattern ``%1=%1.'' matches exactly those strings
+that begin with a string X, followed by a ``='' (the
+first), followed by a second occurrence of X, followed by
+a period. In this way, the input/output pattern
+.PP
+.nf
+.fam C
+          mov $%1,r%2
+          mov *r%2,r%2
+          =
+          mov %1,r%2
+
+.fam T
+.fi
+commands copt to replace runs like
+.PP
+.nf
+.fam C
+          mov $_a,r3
+          mov *r3,r3
+
+.fam T
+.fi
+with
+.PP
+.nf
+.fam C
+          mov _a,r3
+
+.fam T
+.fi
+Note that a tab or newline can terminate a %\fBn\fP variable.
+.PP
+copt compares each run of input patterns with the current
+input instruction and its predecessors. If no match is
+found, it advances to the next input instruction and tries
+again. Otherwise, it replaces the input instructions with
+the corresponding output patterns, pattern variables
+instantiated,and resumes its search with the \fIfirst\fP
+instruction of the replacement. copt matches input patterns
+in reverse order to cascade optimizations without
+backing up.
+.SH BUGS
+Errors in optimization files are always possible.
+.SH SEE ALSO
+\fBz88dk\fP(1), \fBz88dk-zcc\fP(1), \fBz88dk-z80asm\fP(1), \fBz88dk-appmake\fP(1), \fBz88dk-copt\fP(1).
+.SH AUTHOR
+z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
--- z88dk-1.8.ds1.orig/debian/manpages/makemanpages.sh
+++ z88dk-1.8.ds1/debian/manpages/makemanpages.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Krystian W³osek <tygrys@waw.pdi.net>
+
+export LANG=C
+
+DOCS="z88dk zcc appmake copt sccz80 z80asm zcpp"
+EXT="1.txt"
+MANEXT="1"
+
+for i in $DOCS; do
+	if [ -e $i.$EXT ]; then
+		echo "processing $i"
+		txt2man -t $i -s 1 -v "z88 Development Kit" $i.$EXT > $i.$MANEXT
+	fi
+done
--- z88dk-1.8.ds1.orig/debian/manpages/zcc.1
+++ z88dk-1.8.ds1/debian/manpages/zcc.1
@@ -0,0 +1,255 @@
+.\"Text automatically generated by txt2man
+.TH zcc 1 "01 December 2009" "" "z88 Development Kit"
+.SH NAME
+\fBzcc \fP- The frontend of z88dk
+.SH SYSNOPIS
+zcc [flags] [files to be compiled/linked]
+.SH DESCRIPTION
+This manual page documents briefly the z88dk tools. This manual page
+was written for the Debian GNU/Linux distribution (but may be used
+by others), because the original program does not have a manual page.
+.RE
+.PP
+
+.RS
+Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc for the complete description of the system.
+If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+.PP
+The frontend of z88dk is called zcc, it is this that you should call
+if you want to do any compilations.
+.PP
+The files can be either C files (.c), preprocessed C \fBfiles\fP(.i),
+compiled C files (.asm), optimised compiled file (.opt) or assembled
+files (.obj), any combination of them can be mixed together and the
+relevant processed done on them.
+.PP
+Processing of a file list is done on each file in turn (i.e. preprocess,
+compile, optimise, assemble) at the end all files may be linked into
+a single executable if desired.
+.SH OPTIONS
+Options to control the action of the frontend:
+.TP
+.B
++[file]
+Name of alternate config file (must be the first argument).
+.PP
+.nf
+.fam C
+   Predefined alternate configs:
+     abc80        ABC80
+     aceansi      Jupiter ACE, using VT-ANSI engine
+     cpm          CP/M
+     msx          MSX 1
+     mz           Sharp MZ
+     mzansi       Sharp MZ, using VT-ANSI
+     nc           Amstrad NC100
+     rex          REX 6000
+     sam          Sam Coupe
+     svi          Spectravideo SVI
+     m5           SORD M5
+     ti82         Ti82, using ROM text routines
+     ti82ansi     Ti82, using VT-ANSI
+     ti83         Ti83, using ROM text routines
+     ti83ansi     Ti83, using VT-ANSI
+     ti85         Ti85, using ROM text routines
+     ti85ansi     Ti85, using VT-ANSI
+     ti86         Ti86, using ROM text routines
+     ti86ansi     Ti86, using VT-ANSI
+     ti8x         Ti83+, using ROM text routines
+     [ti8xansi]   Ti83+, using VT-ANSI
+     vz           VZ / Laser 200
+     vzansi       VZ / Laser 200, using VT-ANSI
+     z88          Cambridge Z88
+     z88ansi      Cambridge Z88, using VT-ANSI
+     z88net       Cambridge Z88 with TCP/IP
+     zx           ZX Spectrum
+     zx81         ZX 81
+     zx81ansi     ZX 81, using VT-ANSI
+     zxansi       ZX Spectrum, using VT-ANSI
+
+.fam T
+.fi
+.TP
+.B
+\fB-a\fP
+Produce .asm (or .opt) file only
+.TP
+.B
+\fB-c\fP
+Do not link object files
+.TP
+.B
+\fB-E\fP
+Preprocess files only, leave output in .i file
+.TP
+.B
+\fB-o\fP [file]
+Specify output file for binary (default is a.bas for BASIC programs and a.bin for application binaries)
+.TP
+.B
+\fB-On\fP
+Optimize compiler output (to .opt file) n can be either 0 (none) 1,2,3, level 2 is recommended. Level 3 is suitable for large programs (includes certain lib functions to reduce size of \fBcode\fP(!))
+.TP
+.B
+\fB-v\fP
+Verbose - echo commands as they are executed
+.TP
+.B
+\fB-vn\fP
+Don't be verbose
+.RE
+.PP
+
+
+.RS
+Options to control library usage:
+.TP
+.B
+\fB-l\fP[name]
+Link in a library - supply just the name (after placing them in the correct directory).
+.PP
+.nf
+.fam C
+      The 'name' are:
+      farz88       Z88 far support
+      gfx          Z88 BASIC graphics lib
+      gfxapp       Z88 application graphics lib
+      m            Generic math routines
+      malloc       Generic near malloc routine
+      mz           OZ's math routines
+      ndos         Fake file-routines, return errors only
+      net          Z88 socket routines for ZSock
+      netdev       Z88 socket routines for devices
+      p3           +3 file support library
+      tigray82     Ti82 graylib routines
+      tigray83     Ti83 graylib routines
+      tigray83p    Ti83+ graylib routines
+      tigray85     Ti85 graylib routines
+      tigray86     Ti86 graylib routines
+      z88          Some Z88 application routines, like mailboxing
+      zxmath       ZX Spectrum ROM based math routines
+      zxvgs        ZXVGS hardware support
+
+.fam T
+.fi
+.TP
+.B
+\fB-m\fP
+Generate .map files when assembling/linking
+.RE
+.PP
+
+
+.RS
+Options to control the type code produced:
+.TP
+.B
+\fB-unsigned\fP
+Implicitly define everything as unsigned unless explicitly told otherwise.
+.TP
+.B
+\fB-create-app\fP
+Create an application image (i.e. bank 63,62 etc)
+.TP
+.B
+\fB-make-app\fP
+(App) Notify the compiler that you're trying to make an application
+.TP
+.B
+\fB-reqpag\fP=
+(App) Number of 256 byte pages required for bad application
+.TP
+.B
+\fB-zorg\fP=
+(App) Origin for a Z88 application
+.TP
+.B
+\fB-safedata\fP=
+(App) Amount of safedata required by your code
+.TP
+.B
+\fB-defvars\fP=
+(App) Where static variables should be dropped (only valid for single file compilations, but see later)
+.TP
+.B
+\fB-expandz88\fP
+(App) Expanded z88 required
+\fB-no-expandz88\fP (App) Expanded z88 not required (these two flags toggle some startup code to check for an expanded machine)
+.TP
+.B
+\fB-startup\fP=3
+Produce standalone code that can be run from a set address from BASIC. Use \fB-zorg\fP= to change the address
+.TP
+.B
+\fB-R\fP
+(Use with above) produces relocatable code that can be loaded into a DIM'd BASIC array.
+.TP
+.B
+\fB-smartpf\fP
+Intelligent printf routine handling
+.TP
+.B
+\fB-no-smartpf\fP
+Turn off the intelligent printf handling
+.TP
+.B
+\fB-make-lib\fP
+Shortcut to generate .o files from library .c files
+.TP
+.B
+\fB-stackoffset\fP
+Sets the stack offset for shared libs (see package.txt for details)
+.RE
+.PP
+
+
+.RS
+Miscellaneous options:
+.TP
+.B
+\fB-z80-verb\fP
+Allow z80asm to be verbose, this tends to generate a lot
+of output to the screen so may not be desired.
+.TP
+.B
+\fB-cc\fP
+Intersperse C code as comments in the assembler output, warning:
+this *will* clobber some optimizations.
+.TP
+.B
+\fB-Wall\fP
+Turn on all the compiler warnings
+.TP
+.B
+\fB-Wnone\fP
+Turn off all compiler warnings
+.TP
+.B
+\fB-Wn\fP[num]
+Turn off the compiler warning [num]
+.TP
+.B
+\fB-W\fP[num]
+Turn on the compiler warning [num]
+.TP
+.B
+\fB-asxx\fP
+Cause the compiler to emit asxx compatible code
+.TP
+.B
+\fB-Cp\fP[option]
+Pass an option through to the pre-processor
+.TP
+.B
+\fB-Ca\fP[option]
+Pass an option through to the assembler
+.PP
+In addition, the flags, \fB-D\fP, \fB-I\fP, \fB-U\fP are passed through to the preprocessor.
+.SH SEE ALSO
+\fBz88dk\fP(1), \fBz88dk-zcc\fP(1), \fBz88dk-z80asm\fP(1), \fBz88dk-appmake\fP(1), \fBz88dk-copt\fP(1).
+.RE
+.PP
+
+.SH AUTHOR
+z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/appmake.1
+++ z88dk-1.8.ds1/debian/manpages/appmake.1
@@ -0,0 +1,272 @@
+.\"Text automatically generated by txt2man
+.TH appmake 1 "01 December 2009" "" "z88 Development Kit"
+.SH NAME
+\fBappmake \fP- The z88dk application generator
+.SH SYSNOPIS
+appmake [+target] [options]
+.SH DESCRIPIONS
+This manual page documents briefly the z88dk tools. This manual page
+was written for the Debian GNU/Linux distribution (but may be used
+by others), because the original program does not have a manual page.
+.PP
+Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc/ for the complete description of the system.
+If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+.PP
+This program is used to produce files which are suitable for use in
+emulators or on the real hardware.
+.SH OPTIONS
+Options used in all targets:
+.TP
+.B
+\fB-h\fP
+\fB--help\fP            Display help
+.TP
+.B
+\fB-b\fP
+\fB--binfile\fP [file]  Linked binary file
+.TP
+.B
+\fB-o\fP
+\fB--output\fP [name]   Name of output file
+.RE
+.PP
+
+.RS
+.TP
+.B
++[target]
+generate file for target machine.
+Targets with additional options are:
+.RS
+.TP
+.B
+abc80
+.TP
+.B
+ace
+Generates a .byt file suitable for loading into emulators
+.TP
+.B
+acetap
+Generates a .TAP for the Ace32 emulator
+.TP
+.B
+aquarius
+Creates a BASIC loader file and binary stored in variable array format
+.TP
+.B
+cpc
+Gegerates file for Amstrad CPC
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-c\fP
+\fB--crt0file\fP [file]  crt0 file used in linking
+.RS
+.TP
+.B
+\fB--exec\fP [nnnn]
+Location address to start execution
+.TP
+.B
+\fB--org\fP [nnnn]
+Origin of the binary
+.RE
+.RE
+.TP
+.B
+hex
+Creates an intel hex record suitable for embedded devices
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--org\fP [nnnn]
+Origin of the binary
+.RE
+.TP
+.B
+msx
+Adds a file header to enable the program to be loaded using 'bload "file.bin",r
+.TP
+.B
+mz
+.TP
+.B
+nas
+Generates a .NAS file suitable for use by emulators
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--org\fP [nnnn]
+Origin of the binary
+.RE
+.TP
+.B
+rex
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-n\fP
+\fB--appname\fP [name] Application Name
+.TP
+.B
+\fB-c\fP
+\fB--comment\fP [text] Application Comment
+.RS
+.TP
+.B
+\fB--nt\fP
+Don't pad out to 8k addin
+.RE
+.RE
+.TP
+.B
+ti82
+Creates a .82p file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+ti83
+Creates a .83p file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+ti8x
+Creates a .8xp file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+ti85
+Creates a .85p file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+ti86
+Creates a .86p file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+ti86s
+Creates a .86s file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB--comment\fP [text]
+File comment (42 chars)
+.RE
+.TP
+.B
+svi
+Creates a .cas file loadable with the SVI emulator
+.TP
+.B
+z88
+Generates .63 and .62 files suitable for burning to EPROM
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-c\fP
+\fB--crt0file\fP [file]   crt0 file used in linking
+.RS
+.TP
+.B
+\fB--nt\fP
+Do not truncate bank 63
+.RE
+.RE
+.TP
+.B
+z88shell
+Patches the header to ensure that the program is recognised by the shell
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-c\fP
+\fB--crt0file\fP [file]   crt0 file used in linking
+.RE
+.TP
+.B
+zxvgs
+Creates a zxvgs application file
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-c\fP
+\fB--crt0file\fP [file]   crt0 file used in linking
+.RE
+.TP
+.B
+zx
+Generates a .TAP file complete with BASIC header
+.PP
+Additional options:
+.RS
+.TP
+.B
+\fB-c\fP
+\fB--crt0file\fP [file]    crt0 file used in linking
+.RS
+.TP
+.B
+\fB--org\fP [nnnn]
+Origin of the binary
+.TP
+.B
+\fB--blockname\fP [name]
+Name of the code block in tap file
+.SH SEE ALSO
+\fBz88dk\fP(1), \fBz88dk-zcc\fP(1), \fBz88dk-z80asm\fP(1), \fBz88dk-appmake\fP(1), \fBz88dk-copt\fP(1).
+.SH AUTHOR
+z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/appmake.1.txt
+++ z88dk-1.8.ds1/debian/manpages/appmake.1.txt
@@ -0,0 +1,114 @@
+NAME
+  appmake - The z88dk application generator
+SYSNOPIS
+  appmake [+target] [options]
+DESCRIPIONS
+  This manual page documents briefly the z88dk tools. This manual page
+  was written for the Debian GNU/Linux distribution (but may be used
+  by others), because the original program does not have a manual page.
+
+  Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc/ for the complete description of the system.
+  If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+
+  This program is used to produce files which are suitable for use in
+  emulators or on the real hardware.
+
+OPTIONS
+  Options used in all targets:
+  -h   --help            Display help
+  -b   --binfile [file]  Linked binary file
+  -o   --output [name]   Name of output file
+
+
+  +[target]      generate file for target machine.
+   Targets with additional options are:
+   
+   abc80        
+   ace           Generates a .byt file suitable for loading into emulators
+   acetap        Generates a .TAP for the Ace32 emulator
+   aquarius     Creates a BASIC loader file and binary stored in variable array format
+   cpc          Gegerates file for Amstrad CPC
+
+   Additional options:
+     -c   --crt0file [file]  crt0 file used in linking
+          --exec [nnnn]      Location address to start execution
+          --org [nnnn]       Origin of the binary
+
+   hex          Creates an intel hex record suitable for embedded devices
+
+   Additional options:
+     --org [nnnn]    Origin of the binary
+
+   msx          Adds a file header to enable the program to be loaded using 'bload "file.bin",r
+   mz           
+   nas          Generates a .NAS file suitable for use by emulators
+
+   Additional options:
+     --org [nnnn]    Origin of the binary
+
+   rex         
+
+   Additional options:
+     -n   --appname [name] Application Name
+     -c   --comment [text] Application Comment
+          --nt              Don't pad out to 8k addin
+
+   ti82         Creates a .82p file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+
+   ti83         Creates a .83p file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+
+   ti8x         Creates a .8xp file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+
+   ti85         Creates a .85p file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+
+   ti86         Creates a .86p file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+   ti86s       Creates a .86s file
+
+   Additional options:
+     --comment [text]  File comment (42 chars)
+
+   svi          Creates a .cas file loadable with the SVI emulator
+   z88          Generates .63 and .62 files suitable for burning to EPROM
+
+   Additional options:
+     -c   --crt0file [file]   crt0 file used in linking
+          --nt                Do not truncate bank 63
+
+   z88shell     Patches the header to ensure that the program is recognised by the shell
+
+   Additional options:
+     -c   --crt0file [file]   crt0 file used in linking
+
+   zxvgs        Creates a zxvgs application file
+
+   Additional options:
+     -c   --crt0file [file]   crt0 file used in linking
+
+   zx           Generates a .TAP file complete with BASIC header
+
+   Additional options:
+     -c   --crt0file [file]    crt0 file used in linking
+          --org [nnnn]         Origin of the binary
+          --blockname [name]   Name of the code block in tap file
+
+SEE ALSO
+  z88dk(1), z88dk-zcc(1), z88dk-z80asm(1), z88dk-appmake(1), z88dk-copt(1).
+
+AUTHOR
+  z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+  This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/manpages/zcc.1.txt
+++ z88dk-1.8.ds1/debian/manpages/zcc.1.txt
@@ -0,0 +1,139 @@
+NAME
+  zcc - The frontend of z88dk
+SYSNOPIS
+  zcc [flags] [files to be compiled/linked]
+DESCRIPTION
+  This manual page documents briefly the z88dk tools. This manual page
+  was written for the Debian GNU/Linux distribution (but may be used
+  by others), because the original program does not have a manual page.
+
+
+  Please refer to the z88dk documentation in /usr/share/doc/z88dk-doc for the complete description of the system.
+  If /usr/share/doc/z88dk-doc not exists, please install the package z88dk-doc.
+
+  The frontend of z88dk is called zcc, it is this that you should call
+  if you want to do any compilations.
+
+  The files can be either C files (.c), preprocessed C files(.i),
+  compiled C files (.asm), optimised compiled file (.opt) or assembled
+  files (.obj), any combination of them can be mixed together and the
+  relevant processed done on them.
+
+  Processing of a file list is done on each file in turn (i.e. preprocess,
+  compile, optimise, assemble) at the end all files may be linked into
+  a single executable if desired.
+
+OPTIONS
+  Options to control the action of the frontend:
+  +[file]       Name of alternate config file (must be the first argument).
+
+   Predefined alternate configs:
+     abc80        ABC80
+     aceansi      Jupiter ACE, using VT-ANSI engine
+     cpm          CP/M
+     msx          MSX 1
+     mz           Sharp MZ
+     mzansi       Sharp MZ, using VT-ANSI
+     nc           Amstrad NC100
+     rex          REX 6000
+     sam          Sam Coupe
+     svi          Spectravideo SVI
+     m5           SORD M5
+     ti82         Ti82, using ROM text routines
+     ti82ansi     Ti82, using VT-ANSI
+     ti83         Ti83, using ROM text routines
+     ti83ansi     Ti83, using VT-ANSI
+     ti85         Ti85, using ROM text routines
+     ti85ansi     Ti85, using VT-ANSI
+     ti86         Ti86, using ROM text routines
+     ti86ansi     Ti86, using VT-ANSI
+     ti8x         Ti83+, using ROM text routines
+     [ti8xansi]   Ti83+, using VT-ANSI
+     vz           VZ / Laser 200
+     vzansi       VZ / Laser 200, using VT-ANSI
+     z88          Cambridge Z88
+     z88ansi      Cambridge Z88, using VT-ANSI
+     z88net       Cambridge Z88 with TCP/IP
+     zx           ZX Spectrum
+     zx81         ZX 81
+     zx81ansi     ZX 81, using VT-ANSI
+     zxansi       ZX Spectrum, using VT-ANSI
+
+  -a            Produce .asm (or .opt) file only
+  -c            Do not link object files
+  -E            Preprocess files only, leave output in .i file
+  -o [file]     Specify output file for binary (default is a.bas for BASIC programs and a.bin for application binaries)
+  -On           Optimize compiler output (to .opt file) n can be either 0 (none) 1,2,3, level 2 is recommended. Level 3 is suitable for large programs (includes certain lib functions to reduce size of code(!))
+  -v            Verbose - echo commands as they are executed
+  -vn           Don't be verbose
+
+
+
+  Options to control library usage:
+  -l[name]      Link in a library - supply just the name (after placing them in the correct directory).
+
+      The 'name' are:
+      farz88       Z88 far support
+      gfx          Z88 BASIC graphics lib
+      gfxapp       Z88 application graphics lib
+      m            Generic math routines
+      malloc       Generic near malloc routine
+      mz           OZ's math routines
+      ndos         Fake file-routines, return errors only
+      net          Z88 socket routines for ZSock
+      netdev       Z88 socket routines for devices
+      p3           +3 file support library
+      tigray82     Ti82 graylib routines
+      tigray83     Ti83 graylib routines
+      tigray83p    Ti83+ graylib routines
+      tigray85     Ti85 graylib routines
+      tigray86     Ti86 graylib routines
+      z88          Some Z88 application routines, like mailboxing
+      zxmath       ZX Spectrum ROM based math routines
+      zxvgs        ZXVGS hardware support
+  
+  -m            Generate .map files when assembling/linking
+
+
+
+  Options to control the type code produced:
+  -unsigned     Implicitly define everything as unsigned unless explicitly told otherwise.
+  -create-app   Create an application image (i.e. bank 63,62 etc)
+  -make-app     (App) Notify the compiler that you're trying to make an application
+  -reqpag=      (App) Number of 256 byte pages required for bad application
+  -zorg=        (App) Origin for a Z88 application
+  -safedata=    (App) Amount of safedata required by your code
+  -defvars=     (App) Where static variables should be dropped (only valid for single file compilations, but see later)
+  -expandz88    (App) Expanded z88 required
+  -no-expandz88 (App) Expanded z88 not required (these two flags toggle some startup code to check for an expanded machine)
+  -startup=3    Produce standalone code that can be run from a set address from BASIC. Use -zorg= to change the address
+  -R            (Use with above) produces relocatable code that can be loaded into a DIM'd BASIC array.
+  -smartpf      Intelligent printf routine handling
+  -no-smartpf   Turn off the intelligent printf handling
+  -make-lib     Shortcut to generate .o files from library .c files
+  -stackoffset  Sets the stack offset for shared libs (see package.txt for details)
+                   
+
+
+  Miscellaneous options:
+  -z80-verb     Allow z80asm to be verbose, this tends to generate a lot
+                   of output to the screen so may not be desired.
+  -cc           Intersperse C code as comments in the assembler output, warning:
+                   this *will* clobber some optimizations.
+  -Wall         Turn on all the compiler warnings
+  -Wnone        Turn off all compiler warnings
+  -Wn[num]      Turn off the compiler warning [num]
+  -W[num]       Turn on the compiler warning [num]
+  -asxx	        Cause the compiler to emit asxx compatible code
+  -Cp[option]   Pass an option through to the pre-processor
+  -Ca[option]   Pass an option through to the assembler
+
+  In addition, the flags, -D, -I, -U are passed through to the preprocessor.
+
+SEE ALSO
+  z88dk(1), z88dk-zcc(1), z88dk-z80asm(1), z88dk-appmake(1), z88dk-copt(1).
+
+
+AUTHOR
+  z88dk was written by Dominic Morris <dom@z88dk.org>, and others.
+  This manual page was written by Krystian Wlosek <tygrys@waw.pdi.net> using exists documentation, for the Debian GNU/Linux system.
--- z88dk-1.8.ds1.orig/debian/po/de.po
+++ z88dk-1.8.ds1/debian/po/de.po
@@ -0,0 +1,21 @@
+# Translation of z88dk debconf templates to German
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
+# This file is distributed under the same license as the z88dk package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk 1.6.ds1-4\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2007-01-25 18:54+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Standard z88dk-Ziel:"
--- z88dk-1.8.ds1.orig/debian/po/ru.po
+++ z88dk-1.8.ds1/debian/po/ru.po
@@ -0,0 +1,25 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk 1.8.ds1-4\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2009-02-08 12:54+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Цель по умолчанию для z88dk:"
+
--- z88dk-1.8.ds1.orig/debian/po/fr.po
+++ z88dk-1.8.ds1/debian/po/fr.po
@@ -0,0 +1,22 @@
+# z88dk
+# Copyright (C) 2006
+# This file is distributed under the same license as the z88dk package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2006-10-29 12:38+0100\n"
+"Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
+"Language-Team: french <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Veuillez choisir la cible par défaut du compilateur z88dk :"
--- z88dk-1.8.ds1.orig/debian/po/nl.po
+++ z88dk-1.8.ds1/debian/po/nl.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2007-10-25 18:50+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Standaard z88dk-doel:"
--- z88dk-1.8.ds1.orig/debian/po/ja.po
+++ z88dk-1.8.ds1/debian/po/ja.po
@@ -0,0 +1,22 @@
+# Copyright (C) 2008 Krystian Wlosek <tygrys@waw.pdi.net>
+# This file is distributed under the same license as z88dk package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk 1.8ds1-4\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2008-12-28 22:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "デフォルトでの z88dk のターゲット:"
+
--- z88dk-1.8.ds1.orig/debian/po/pl.po
+++ z88dk-1.8.ds1/debian/po/pl.po
@@ -0,0 +1,22 @@
+# z88dk
+# Copyright (C) 2006
+# This file is distributed under the same license as the z88dk package.
+# Krystian Wlosek <tygrys@waw.pdi.net>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2006-04-25 15:51+1\n"
+"Last-Translator: Krystian Wlosek <tygrys@waw.pdi.net>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Domy¶lny cel dla z88dk:"
--- z88dk-1.8.ds1.orig/debian/po/POTFILES.in
+++ z88dk-1.8.ds1/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
--- z88dk-1.8.ds1.orig/debian/po/cs.po
+++ z88dk-1.8.ds1/debian/po/cs.po
@@ -0,0 +1,24 @@
+# z88dk
+# Copyright (C) 2006
+# This file is distributed under the same license as the 2006 package.
+#
+# Jakub Kasparec <mr.k@centrum.cz>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2006-12-07 00:31+0100\n"
+"Last-Translator: Jakub Kasparec <mr.k@centrum.cz>\n"
+"Language-Team: czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Standardní cíl balíku z88dk:"
+
--- z88dk-1.8.ds1.orig/debian/po/templates.pot
+++ z88dk-1.8.ds1/debian/po/templates.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr ""
--- z88dk-1.8.ds1.orig/debian/po/pt.po
+++ z88dk-1.8.ds1/debian/po/pt.po
@@ -0,0 +1,24 @@
+# translation of z88dk debconf to Portuguese
+# Copyright (C) 2007 Américo Monteiro
+# This file is distributed under the same license as the z88dk package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk 1.6.ds1-6\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2007-07-21 22:25+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Alvo z88dk por omissão:"
+
--- z88dk-1.8.ds1.orig/debian/po/es.po
+++ z88dk-1.8.ds1/debian/po/es.po
@@ -0,0 +1,44 @@
+# z88dk po-debconf translation to Spanish
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the z88dk package.
+#
+# Changes:
+#   - Initial translation
+#       Ricardo Fraile <rikr@esdebian.org>, 2010
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+#   - El proyecto de traducción de Debian al español
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas y normas de traducción en
+#     http://www.debian.org/intl/spanish/notas
+#
+#   - La guía de traducción de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk 1.8.ds1-6\n"
+"Report-Msgid-Bugs-To: z88dk@packages.debian.org\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2010-04-12 17:12+0200\n"
+"Last-Translator: Ricardo Fraile <rikr@esdebian.org>\n"
+"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "Destino predeterminado de z88dk:"
+
--- z88dk-1.8.ds1.orig/debian/po/sv.po
+++ z88dk-1.8.ds1/debian/po/sv.po
@@ -0,0 +1,23 @@
+# translation of z88dk.po to swedish
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Martin Bagge <brother@bsnet.se>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: z88dk\n"
+"Report-Msgid-Bugs-To: tygrys@waw.pdi.net\n"
+"POT-Creation-Date: 2006-07-06 16:16+0200\n"
+"PO-Revision-Date: 2008-09-25 12:26+0200\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../templates:1001
+msgid "Default z88dk target:"
+msgstr "z88dk standardmål:"
--- z88dk-1.8.ds1.orig/debian/patches/02_lib_cpc_crt0.asm.diff
+++ z88dk-1.8.ds1/debian/patches/02_lib_cpc_crt0.asm.diff
@@ -0,0 +1,235 @@
+--- z88dk-1.8.ds1/lib/cpc_crt0.asm.orig	2008-10-16 15:39:21.000000000 +0200
++++ z88dk-1.8.ds1/lib/cpc_crt0.asm	2008-10-16 13:46:26.000000000 +0200
+@@ -2,37 +2,48 @@
+ ;
+ ;       Stefano Bodrato 8/6/2000
+ ;
+-;       $Id: cpc_crt0.asm,v 1.9 2007/07/21 21:27:23 dom Exp $
++;       $Id: cpc_crt0.asm,v 1.13 2008/05/26 06:38:07 stefano Exp $
+ ;
+ 
+         MODULE  cpc_crt0
+ 
+ 
++;--------
++; Include zcc_opt.def to find out some info
++;--------
+         INCLUDE "zcc_opt.def"
+ 
++;--------
++; Some scope definitions
++;--------
+ 
+-        XREF    _main
++        XREF    _main           ;main() is always external to crt0 code
+ 
++        XDEF    cleanup         ;jp'd to by exit()
++        XDEF    l_dcal          ;jp(hl)
+ 
++        XDEF    _vfprintf       ;jp to the printf() core
+ 
+-        XDEF    cleanup
+-        XDEF    l_dcal
+-        XDEF    firmware
+-        XDEF	_vfprintf
+-        
+-        XDEF    _std_seed
+-        XDEF    exitsp
++        XDEF    exitsp          ;atexit() variables
+         XDEF    exitcount
+ 
+-        ;For stdin, stdout, stder
++        XDEF    heaplast        ;Near malloc heap variables
++        XDEF    heapblocks
++
++        XDEF    __sgoioblk      ;stdio info block
++
++        XDEF    base_graphics   ;Graphical variables
++        XDEF    coords          ;Current xy position
+ 
+-        XDEF    __sgoioblk
++        XDEF    snd_tick        ;Sound variable
+ 
+-;       Graphics stuff
+-        XDEF	base_graphics
+-        XDEF	coords
++        XDEF    call_rom3       ;Interposer
+ 
+-        ; Now, getting to the real stuff now!
++        XDEF    firmware_bc     ;Needed by the firmware interposer
++
++;--------
++; Set an origin for the application (-zorg=) default to $6000
++;--------
+ 
+         IF      !myzorg
+                 defc    myzorg  = $6000
+@@ -43,28 +54,33 @@
+         org     myzorg
+ 
+ 
++;--------
++; REAL CODE
++;--------
++
+ .start
+-        di
++        ld      hl,($39)        ; Original Interrupt code
++        ld      (oldint),hl
++        ld      hl,newint       ; Point to a null handler (increase stability)
++        ld      ($39),hl
++        
+         ld      (start1+1),sp
+         ld      hl,-6530
+         add     hl,sp
+         ld      sp,hl
+         ld      (exitsp),sp
+         exx
+-        ld      (firmware_bc),bc
+-        push    af
+-        pop     hl
+-        ld      (firmware_af),hl
++        ld      (firmware_bc),bc        ; keep BC', otherwise crash
+         exx
+ IF !DEFINED_nostreams
+ IF DEFINED_ANSIstdio
+ ; Set up the std* stuff so we can be called again
+         ld      hl,__sgoioblk+2
+-        ld      (hl),19	;stdin
++        ld      (hl),19 ;stdin
+         ld      hl,__sgoioblk+6
+-        ld      (hl),21	;stdout
++        ld      (hl),21 ;stdout
+         ld      hl,__sgoioblk+10
+-        ld      (hl),21	;stderr
++        ld      (hl),21 ;stderr
+ ENDIF
+ ENDIF
+ 
+@@ -76,6 +92,7 @@
+ ENDIF
+ 
+         call    _main
++
+ .cleanup
+ ;
+ ;       Deallocate memory which has been allocated here!
+@@ -84,12 +101,17 @@
+ IF !DEFINED_nostreams
+ IF DEFINED_ANSIstdio
+         LIB     closeall
+-        call	closeall
++        call    closeall
+ ENDIF
+ ENDIF
++        exx
++        ld      bc,(firmware_bc)        ; restore BC'
++        exx
+ 
++        ld      hl,(oldint)
++        ld      ($39),hl
++        
+ .start1 ld      sp,0
+-        ei
+         ret
+ 
+ .l_dcal jp      (hl)
+@@ -98,7 +120,7 @@
+ 
+ .__sgoioblk
+ IF DEFINED_ANSIstdio
+-        INCLUDE	"#stdio_fp.asm"
++        INCLUDE "#stdio_fp.asm"
+ ELSE
+         defw    -11,-12,-10
+ ENDIF
+@@ -109,54 +131,43 @@
+ 
+ ._vfprintf
+ IF DEFINED_floatstdio
+-	LIB	vfprintf_fp
+-	jp	vfprintf_fp
++        LIB     vfprintf_fp
++        jp      vfprintf_fp
+ ELSE
+-	IF DEFINED_complexstdio
+-		LIB	vfprintf_comp
+-		jp	vfprintf_comp
+-	ELSE
+-		IF DEFINED_ministdio
+-			LIB	vfprintf_mini
+-			jp	vfprintf_mini
+-		ENDIF
+-	ENDIF
+-ENDIF
+-
+-; Function to call firmware function
+-; ix = firmware routine to call
+-; 
+-.firmware
+-        exx                      ; Use alternate registers
+-        ex      (sp),hl          ; get return address
+-        ld      c,(hl)
+-        inc     hl
+-        ld      b,(hl)           ; BC=BASIC address
+-        inc     hl
+-        ex      (sp),hl          ; restore return address
+-        push    bc
+-        ld      bc,(firmware_bc)
+-        ld      hl,(firmware_af)
+-        push    hl
+-        pop     af
+-        exx                      ; Back to the regular set
+-        ret                      ; And call the firmware routine 
++        IF DEFINED_complexstdio
++                LIB     vfprintf_comp
++                jp      vfprintf_comp
++        ELSE
++                IF DEFINED_ministdio
++                        LIB     vfprintf_mini
++                        jp      vfprintf_mini
++                ENDIF
++        ENDIF
++ENDIF
+ 
+         
+-._std_seed      defw    0       ;  Default seed
++IF !DEFINED_HAVESEED
++                XDEF    _std_seed        ;Integer rand() seed
++._std_seed       defw    0       ; Seed for integer rand() routines
++ENDIF
++
+ .exitsp         defw    0       ;  atexit       
+ .exitcount      defb    0
+ .base_graphics
+-                defw	$C000
+-.coords         defw	0
++                defw    $C000
++.coords         defw    0
+ .firmware_bc    defw    0
+-.firmware_af    defw    0
++
++.heaplast       defw    0       ; Address of last block on heap
++.heapblocks     defw    0       ; Number of blocks
+ 
+                 defm    "Small C+ CPC"
+                 defb    0
+ 
+ IF NEED_floatpack
+         INCLUDE         "#float.asm"
++;.init_floatpack
++;       ret
+ 
+ ;seed for random number generator - not used yet..
+ .fp_seed        defb    $80,$80,0,0,0,0
+@@ -167,3 +178,10 @@
+ 
+ ENDIF
+ 
++
++.newint
++        ei
++        reti
++
++.oldint
++        defw 0
--- z88dk-1.8.ds1.orig/debian/patches/04_src_appmake.diff
+++ z88dk-1.8.ds1/debian/patches/04_src_appmake.diff
@@ -0,0 +1,345 @@
+diff -Naur z88dk/src/appmake.orig/abc80.c z88dk/src/appmake/abc80.c
+--- z88dk/src/appmake.orig/abc80.c	2007-11-05 08:54:53.000000000 +0100
++++ z88dk/src/appmake/abc80.c	2008-03-20 13:34:46.000000000 +0100
+@@ -172,5 +172,6 @@
+ 
+     fclose(fpin);
+     fclose(fpout);
++    return 0; /* make gcc happy */
+ }
+ 
+diff -Naur z88dk/src/appmake.orig/ace-byt.c z88dk/src/appmake/ace-byt.c
+--- z88dk/src/appmake.orig/ace-byt.c	2003-03-13 15:50:29.000000000 +0100
++++ z88dk/src/appmake/ace-byt.c	2008-03-20 13:36:16.000000000 +0100
+@@ -47,7 +47,7 @@
+ 
+ 
+ 	if ( (fpin=fopen(binname,"rb") ) == NULL ) {
+-		printf("Can't open input file %s\n");
++		printf("Can't open input file %s\n", binname);
+ 		myexit(NULL,1);
+ 	}
+ 
+@@ -104,5 +104,6 @@
+ 
+ 	fclose(fpin);
+ 	fclose(fpout);
++	return 0; /* make gcc happy */
+ }
+ 		
+diff -Naur z88dk/src/appmake.orig/ace-tap.c z88dk/src/appmake/ace-tap.c
+--- z88dk/src/appmake.orig/ace-tap.c	2003-03-13 15:50:29.000000000 +0100
++++ z88dk/src/appmake/ace-tap.c	2008-03-20 13:35:04.000000000 +0100
+@@ -127,5 +127,6 @@
+ 	writebyte_p(parity,fpout,&parity);
+ 	fclose(fpin);
+ 	fclose(fpout);
++	return 0; /* make gcc happy */
+ }
+ 		
+diff -Naur z88dk/src/appmake.orig/appmake.c z88dk/src/appmake/appmake.c
+--- z88dk/src/appmake.orig/appmake.c	2007-05-10 22:03:25.000000000 +0200
++++ z88dk/src/appmake/appmake.c	2008-03-25 12:44:16.000000000 +0100
+@@ -74,6 +74,7 @@
+ 
+     fprintf(stderr,"Unknown machine target \"%s\"\n\n",target);
+     main_usage();
++    return 0; /* make gcc happy */
+ }
+ 
+ 
+@@ -180,13 +181,14 @@
+             } while ( opt->type != OPT_NONE );
+         }
+     }    
++    return 0; /* make gcc happy */
+ }
+ 
+ 
+ static int option_set(int pos, int max, char *argv[], option_t *option)
+ {
+     int     val;
+-    int     ret;
++    int     ret = 0; /* make gcc happy */
+ 
+     switch ( option->type ) {
+     case OPT_BOOL:
+@@ -206,6 +208,8 @@
+             ret = pos + 1;
+         }
+         break;
++    case OPT_NONE: /* make gcc happy */
++        break;
+     }
+     return ret;
+ }
+@@ -238,6 +242,8 @@
+         case OPT_STR:
+             fprintf(stderr,"%s   --%-15s (string)  %s\n",optstr,opt->lopt,opt->desc);
+             break;
++        case OPT_NONE: /* make gcc happy */
++           break;
+         }
+         opt++;
+     }
+diff -Naur z88dk/src/appmake.orig/aquarius.c z88dk/src/appmake/aquarius.c
+--- z88dk/src/appmake.orig/aquarius.c	2003-03-13 15:50:29.000000000 +0100
++++ z88dk/src/appmake/aquarius.c	2008-03-20 13:29:44.000000000 +0100
+@@ -252,5 +252,6 @@
+ 	fclose(fpin);
+ 	fclose(fpout);
+ 
++	return 0; /* make gcc happy */
+ }
+ 		
+diff -Naur z88dk/src/appmake.orig/cpc.c z88dk/src/appmake/cpc.c
+--- z88dk/src/appmake.orig/cpc.c	2007-06-24 17:32:04.000000000 +0200
++++ z88dk/src/appmake/cpc.c	2008-03-20 13:36:54.000000000 +0100
+@@ -18,7 +18,7 @@
+ static int               origin       = -1;
+ static int               exec         = -1;
+ static char              help         = 0;
+-static unsigned char     parity;
++/* unused  static unsigned char     parity; // make gcc happy */
+ 
+ 
+ /* Options that are available for this module */
+diff -Naur z88dk/src/appmake.orig/hex.c z88dk/src/appmake/hex.c
+--- z88dk/src/appmake.orig/hex.c	2003-03-13 15:50:29.000000000 +0100
++++ z88dk/src/appmake/hex.c	2008-03-20 13:24:55.000000000 +0100
+@@ -21,11 +21,11 @@
+ #define RECSIZE 16
+ 
+ static char             *binname      = NULL;
+-static char             *crtfile      = NULL;
++/* unused static char             *crtfile      = NULL; // make gcc happy */
+ static char             *outfile      = NULL;
+ static int               origin       = -1;
+ static char              help         = 0;
+-static unsigned char     parity;
++/* unused static unsigned char     parity; // make gcc happy */
+ 
+ 
+ /* Options that are available for this module */
+diff -Naur z88dk/src/appmake.orig/msx.c z88dk/src/appmake/msx.c
+--- z88dk/src/appmake.orig/msx.c	2003-03-13 15:50:30.000000000 +0100
++++ z88dk/src/appmake/msx.c	2008-03-20 13:37:55.000000000 +0100
+@@ -29,7 +29,7 @@
+ int msx_exec(char *target)
+ {
+     char    filename[FILENAME_MAX+1];
+-    char        name[11];
++    /* unused char        name[11]; // make gcc happy */
+     FILE        *fpin, *fpout;
+     int        c;
+     int        i;
+@@ -87,6 +87,7 @@
+ 
+     fclose(fpin);
+     fclose(fpout);
++    return 0; /* make gcc happy */
+ }
+                 
+ 
+diff -Naur z88dk/src/appmake.orig/mz.c z88dk/src/appmake/mz.c
+--- z88dk/src/appmake.orig/mz.c	2003-03-13 15:50:30.000000000 +0100
++++ z88dk/src/appmake/mz.c	2008-03-20 12:26:26.000000000 +0100
+@@ -25,7 +25,7 @@
+ int mz_exec(char *target)
+ {
+     char    filename[FILENAME_MAX+1];
+-    char        name[11];
++    /* unused char        name[11]; // make gcc  happy */
+     FILE        *fpin, *fpout;
+     int        c;
+     int        i;
+@@ -93,6 +93,7 @@
+ 
+     fclose(fpin);
+     fclose(fpout);
++    return 0; /* make gcc happy */
+ }
+                 
+ 
+diff -Naur z88dk/src/appmake.orig/newbrain.c z88dk/src/appmake/newbrain.c
+--- z88dk/src/appmake.orig/newbrain.c	2007-06-04 19:13:14.000000000 +0200
++++ z88dk/src/appmake/newbrain.c	2008-03-20 13:31:56.000000000 +0100
+@@ -39,8 +39,8 @@
+     int        i,p,l,b;
+     int        len;
+     int        lnum;
+-    int        blocks;
+-    int        blcount;
++/* unused    int        blocks; // make gcc happy */
++/* unused    int        blcount; // make gcc happy */
+ 
+     unsigned long       checksum;
+ 
+@@ -101,7 +101,7 @@
+             fprintf(fpout,"10 IF TOP>%i THEN RESERVE TOP-%i\n",pos-1,pos-1);
+             fprintf(fpout,"20 FOR i=0TO%i:READa:POKE%i+i,a:NEXT i\n",len-1,pos);
+             fprintf(fpout,"30 CALL%i\n",pos);
+-            fprintf(fpout,"40 END",pos);
++            fprintf(fpout,"40 END\n");
+             lnum=100;
+             /* ... M/C ...*/
+             for (i=0; i<len;i++) {
+@@ -357,4 +357,5 @@
+ 
+     }    
+ 
++    return 0; /* make gcc happy */
+ }
+diff -Naur z88dk/src/appmake.orig/rex6000.c z88dk/src/appmake/rex6000.c
+--- z88dk/src/appmake.orig/rex6000.c	2005-07-10 13:39:31.000000000 +0200
++++ z88dk/src/appmake/rex6000.c	2008-03-20 13:19:44.000000000 +0100
+@@ -122,7 +122,7 @@
+ 
+ 
+     if ( (binfile = fopen(binname,"rb")) == NULL ) {
+-        fprintf(stderr,"Couldn't open binary file: %s\n",binfile[1]);
++        fprintf(stderr,"Couldn't open binary file: %s\n",binname);
+         myexit(NULL,1);
+     }
+ 
+@@ -249,10 +249,10 @@
+ 
+     copy = strdup(orig);
+ 
+-    if ( ptr = strchr(copy,'\n') )
++    if ( (ptr = strchr(copy,'\n')) )
+ 	*ptr = 0;
+ 
+-    if ( ptr = strchr(copy,'\r') )
++    if ( (ptr = strchr(copy,'\r')) )
+ 	*ptr = 0;
+ 
+     return(copy);
+diff -Naur z88dk/src/appmake.orig/sms.c z88dk/src/appmake/sms.c
+--- z88dk/src/appmake.orig/sms.c	2007-06-24 17:32:04.000000000 +0200
++++ z88dk/src/appmake/sms.c	2008-03-20 13:12:23.000000000 +0100
+@@ -15,7 +15,7 @@
+ #define OFFSET 0x7ff0
+ 
+ static char             *binname      = NULL;
+-static char             *crtfile      = NULL;
++/* not used  static char             *crtfile      = NULL; // make gcc happy */
+ static char             *outfile      = NULL;
+ static char              help         = 0;
+ static char              noop         = 0;
+@@ -104,6 +104,7 @@
+ 
+     fclose(fpin);
+     fclose(fpout);
++    return 0; /* make gcc happy */
+ }
+ 
+ 
+diff -Naur z88dk/src/appmake.orig/svi.c z88dk/src/appmake/svi.c
+--- z88dk/src/appmake.orig/svi.c	2003-03-13 15:50:30.000000000 +0100
++++ z88dk/src/appmake/svi.c	2008-03-20 13:29:24.000000000 +0100
+@@ -115,6 +115,7 @@
+ 
+ 	fclose(fpin);
+ 	fclose(fpout);
++	return 0; /* make gcc happy */
+ }
+ 
+ 
+diff -Naur z88dk/src/appmake.orig/tixx.c z88dk/src/appmake/tixx.c
+--- z88dk/src/appmake.orig/tixx.c	2007-06-24 17:32:04.000000000 +0200
++++ z88dk/src/appmake/tixx.c	2008-03-25 12:43:05.000000000 +0100
+@@ -151,9 +151,9 @@
+     char  filename[FILENAME_MAX+1];
+     char  comment[45];
+     FILE *fp;
+-    char *buf, str[256], *c;
+-    char *suffix;
+-    int i, n, ext, n2;
++    char *buf, str[256] /* unused   , *c // make gcc happy */;
++    char *suffix = NULL; /* make gcc happy */
++    int i, n, ext = 0, n2;
+     unsigned short chk;
+ 
+     if ( help || binname == NULL ) {
+diff -Naur z88dk/src/appmake.orig/z88.c z88dk/src/appmake/z88.c
+--- z88dk/src/appmake.orig/z88.c	2005-07-10 13:39:33.000000000 +0200
++++ z88dk/src/appmake/z88.c	2008-03-20 12:16:14.000000000 +0100
+@@ -249,6 +249,7 @@
+     SaveBlock(49152,outfile,".63");
+ 
+     myexit(0,0);
++    return 0; /* make gcc happy */
+ }
+ 
+ static void SaveBlock(unsigned offset, char *base, char *ext)
+diff -Naur z88dk/src/appmake.orig/z88shell.c z88dk/src/appmake/z88shell.c
+--- z88dk/src/appmake.orig/z88shell.c	2007-06-24 17:32:04.000000000 +0200
++++ z88dk/src/appmake/z88shell.c	2008-03-20 13:33:12.000000000 +0100
+@@ -18,7 +18,7 @@
+ static char              help         = 0;
+ 
+ static unsigned char    *memory;      /* Pointer to Z80 memory */
+-static long              zorg;        /* Origin of compiler program */
++/* unused static long              zorg; // make gcc happy */        /* Origin of compiler program */
+ 
+ /* Options that are available for this module */
+ option_t z88shell_options[] = {
+@@ -126,7 +126,7 @@
+ {
+     char    name[FILENAME_MAX+1];
+     char    buffer[LINEMAX+1];
+-    int     length;
++    /* int     length; // unused -- make gcc happy */
+     FILE    *fp;
+ 
+     strcpy(name,base);
+diff -Naur z88dk/src/appmake.orig/zx.c z88dk/src/appmake/zx.c
+--- z88dk/src/appmake.orig/zx.c	2007-06-19 11:20:50.000000000 +0200
++++ z88dk/src/appmake/zx.c	2008-03-25 12:43:21.000000000 +0100
+@@ -47,7 +47,7 @@
+     char    filename[FILENAME_MAX+1];
+     char    name[11];
+     char    mybuf[20];
+-    FILE    *fpin, *fpout, *fpmerge;
++    FILE    *fpin, *fpout, *fpmerge = NULL; /* make gcc happy */
+     long    pos;
+     int     c;
+     int     i;
+@@ -153,7 +153,7 @@
+     writeword_p(26,fpout,&parity);         /* BASIC line length */
+     writebyte_p(0xfd,fpout,&parity);       /* CLEAR */
+     writebyte_p(0xb0,fpout,&parity);       /* VAL */
+-    sprintf(mybuf,"\"%i\":",pos-1);        /* location for CLEAR */
++    sprintf(mybuf,"\"%i\":",(int)(pos-1));        /* location for CLEAR */
+     writestring_p(mybuf,fpout,&parity);
+     writebyte_p(0xef,fpout,&parity);       /* LOAD */
+     writebyte_p('"',fpout,&parity);
+@@ -163,7 +163,7 @@
+     writebyte_p(0xf9,fpout,&parity);       /* RANDOMIZE */
+     writebyte_p(0xc0,fpout,&parity);       /* USR */
+     writebyte_p(0xb0,fpout,&parity);       /* VAL */
+-    sprintf(mybuf,"\"%i\"",pos);           /* Location for USR */
++    sprintf(mybuf,"\"%i\"",(int)pos);           /* Location for USR */
+     writestring_p(mybuf,fpout,&parity);
+     writebyte_p(0x0d,fpout,&parity);       /* ENTER (end of BASIC line) */
+ 
+@@ -214,6 +214,7 @@
+     writebyte_p(parity,fpout,&parity);
+     fclose(fpin);
+     fclose(fpout);
++    return 0; /* make gcc happy */
+ }
+ 
+ 
+diff -Naur z88dk/src/appmake.orig/zxvgs.c z88dk/src/appmake/zxvgs.c
+--- z88dk/src/appmake.orig/zxvgs.c	2003-03-13 15:50:30.000000000 +0100
++++ z88dk/src/appmake/zxvgs.c	2008-03-20 12:16:33.000000000 +0100
+@@ -122,6 +122,7 @@
+         myexit(buffer,1);
+     fclose(fp);
+     myexit(0,0);
++    return 0; /* make gcc happy */
+ }
+ 
+ 
--- z88dk-1.8.ds1.orig/debian/patches/04_src_zcc_zcc.c.diff
+++ z88dk-1.8.ds1/debian/patches/04_src_zcc_zcc.c.diff
@@ -0,0 +1,62 @@
+--- z88dk-1.8.ds1/src/zcc/zcc.c.orig	2008-03-19 17:51:31.000000000 +0100
++++ z88dk-1.8.ds1/src/zcc/zcc.c	2008-03-25 13:51:09.000000000 +0100
+@@ -366,7 +366,7 @@
+ {
+         int     status, errs;
+         int     tstore;
+-        char    *buffer, *outname;
++        char    *buffer = NULL, *outname; /* make gcc happy */
+ 
+         errs = 0;
+          if (!hassuffix(filelist[number], suffix)) return(0);
+@@ -427,7 +427,7 @@
+     char    *p;
+     char    *asmline;    /* patch for z80asm */
+ 	char    *ext;
+-    char    *linkprog = myconf[LINKER].def;
++    /* unused char    *linkprog = myconf[LINKER].def; // make gcc happy */
+ 
+     /* patch for z80asm */
+     if (peepholeopt)  {
+@@ -493,7 +493,7 @@
+     char    **argv;
+ {
+     int     i, gc;
+-    char    *temp,*temp2;
++    /* unused char    *temp,*temp2; // make gcc happy */
+     char    asmarg[4096];      /* Hell, that should be long enough! */
+     char    buffer[LINEMAX+1]; /* For reading in option file */
+     FILE    *fp;
+@@ -1202,9 +1202,9 @@
+ 	while (*ptr && isspace(*ptr))
+ 		++ptr;
+ 
+-	if ( ptr2 = strchr(ptr,'\n') )
++	if ( (ptr2 = strchr(ptr,'\n')) )
+ 		*ptr2 = 0;
+-	if ( ptr2 = strchr(ptr,'\r') )
++	if ( (ptr2 = strchr(ptr,'\r')) )
+ 		*ptr2 = 0;
+ 
+ 
+@@ -1223,9 +1223,9 @@
+ 	while (*ptr && isspace(*ptr))
+ 		++ptr;
+ 
+-	if ( ptr2 = strchr(ptr,'\n') )
++	if ( (ptr2 = strchr(ptr,'\n')) )
+ 		*ptr2 = 0;
+-	if ( ptr2 = strchr(ptr,'\r') )
++	if ( (ptr2 = strchr(ptr,'\r')) )
+ 		*ptr2 = 0;
+ 
+ 
+@@ -1420,7 +1420,7 @@
+ 
+ void tempname(char *filen)
+ {
+-	char	*ptr;
++	/* unused  char	*ptr; // make gcc happy */
+ 
+ #ifdef _WIN32
+ /* Predefined in 32-bit MS Visual C/C++ and Borland Builder C/C++ */
--- z88dk-1.8.ds1.orig/debian/patches/04_src1.8_64bitsupport.diff
+++ z88dk-1.8.ds1/debian/patches/04_src1.8_64bitsupport.diff
@@ -0,0 +1,720 @@
+diff -Naur z88dk-1.8.ds1/src/copt/copt.c z88dk-1.8.ds1-64bit/src/copt/copt.c
+--- z88dk-1.8.ds1/src/copt/copt.c	2002-09-15 19:10:07.000000000 +0200
++++ z88dk-1.8.ds1-64bit/src/copt/copt.c	2010-04-22 13:17:56.000000000 +0200
+@@ -507,12 +507,12 @@
+ 		/* check for activation rules */
+ 		if (o->o_new && strcmp(o->o_new->l_text, "%activate\n") == 0) {
+ 			/* we have to prevent repeated activation of rules */
+-			char signature[160];
++			char signature[240];
+ 			struct lnode *lnp;
+ 			struct onode *nn, *last;
+ 			int skip = 0;
+ 			/* since we 'install()' strings, we can compare pointers */
+-			sprintf(signature, "%s%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x\n",
++			sprintf(signature, (sizeof(char*)>4)?"%s%016lx%016lx%016lx%016lx%016lx%016lx%016lx%016lx%016lx%016lx\n":"%s%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx\n",
+ 				activated,
+ 				vars[0], vars[1], vars[2], vars[3], vars[4],
+ 				vars[5], vars[6], vars[7], vars[8], vars[9]);
+diff -Naur z88dk-1.8.ds1/src/z80asm/config.h z88dk-1.8.ds1-64bit/src/z80asm/config.h
+--- z88dk-1.8.ds1/src/z80asm/config.h	2007-06-24 18:41:41.000000000 +0200
++++ z88dk-1.8.ds1-64bit/src/z80asm/config.h	2010-04-22 13:17:56.000000000 +0200
+@@ -64,6 +64,12 @@
+ #define MAXCODESIZE 65536
+ #endif
+ 
++#ifdef __linux__
++#include <endian.h>
++#if __BYTE_ORDER == __BIG_ENDIAN
++#define ENDIAN 1
++#endif
++#else
+ /* Some clever config-ing if we're using GNUC */
+ #ifdef __BIG_ENDIAN__
+ /* Sadly the compiler on OS-X falls over with the #if below... */
+@@ -75,3 +81,4 @@
+ #endif
+ #endif	/* __GNUC__ */
+ #endif
++#endif
+diff -Naur z88dk-1.8.ds1/src/z80asm/modlink.c z88dk-1.8.ds1-64bit/src/z80asm/modlink.c
+--- z88dk-1.8.ds1/src/z80asm/modlink.c	2002-11-05 12:45:56.000000000 +0100
++++ z88dk-1.8.ds1-64bit/src/z80asm/modlink.c	2010-04-22 13:17:56.000000000 +0200
+@@ -106,11 +106,11 @@
+ int LinkLibModule (struct libfile *library, long curmodule, char *modname);
+ int SearchLibfile (struct libfile *curlib, char *modname);
+ char *ReadName (void);
+-long ReadLong (FILE * fileid);
++int ReadLong (FILE * fileid);
+ void redefinedmsg (void);
+ void CreateLib (void);
+ void SearchLibraries (char *modname);
+-void WriteLong (long fptr, FILE * fileid);
++void WriteLong (int fptr, FILE * fileid);
+ void LinkModules (void);
+ void ModuleExpr (void);
+ void CreateBinFile (void);
+@@ -160,7 +160,7 @@
+ ReadNames (long nextname, long endnames)
+ {
+   char scope, symtype;
+-  long value;
++  int value;
+   symbol *foundsymbol;
+ 
+   do
+@@ -509,7 +509,7 @@
+   while (CURRENTMODULE != lastobjmodule->nextmodule);	/* parse only object modules, not added library modules */
+ 
+   if (verbose == ON)
+-    printf ("Code size of linked modules is %d bytes\n", CODESIZE);
++    printf ("Code size of linked modules is %lu bytes\n", (unsigned long) CODESIZE);
+ 
+   if (ASMERROR == OFF)
+     ModuleExpr ();		/*  Evaluate expressions in  all modules */
+@@ -531,7 +531,7 @@
+ int 
+ LinkModule (char *filename, long fptr_base)
+ {
+-  long fptr_namedecl, fptr_modname, fptr_modcode, fptr_libnmdecl;
++  int fptr_namedecl, fptr_modname, fptr_modcode, fptr_libnmdecl;
+   size_t lowbyte, highbyte, size;
+   int flag = 0;
+ 
+@@ -661,7 +661,7 @@
+ SearchLibfile (struct libfile *curlib, char *modname)
+ {
+ 
+-  long currentlibmodule, modulesize, fptr_mname;
++  int currentlibmodule, modulesize, fptr_mname;
+   int flag;
+   char *mname;
+ 
+@@ -755,8 +755,8 @@
+ void 
+ ModuleExpr (void)
+ {
+-  long fptr_namedecl, fptr_modname, fptr_exprdecl, fptr_libnmdecl;
+-  long fptr_base;
++  int fptr_namedecl, fptr_modname, fptr_exprdecl, fptr_libnmdecl;
++  int fptr_base;
+   struct linkedmod *curlink;
+ 
+   if (verbose)
+@@ -837,7 +837,7 @@
+ 	  *(reloctable + 3) = (unsigned short) sizeof_reloctable / 256U;/* total size of relocation table elements */
+ 
+ 	  fwrite (reloctable, 1U, sizeof_reloctable + 4, binaryfile);	/* write relocation table, inclusive 4 byte header */
+-	  printf ("Relocation header is %d bytes.\n", sizeof_relocroutine + sizeof_reloctable + 4);
++	  printf ("Relocation header is %lu bytes.\n", (unsigned long) (sizeof_relocroutine + sizeof_reloctable + 4));
+ 	  fwrite (codearea, sizeof (char), CODESIZE, binaryfile);	/* write code as one big chunk */
+ 	  fclose (binaryfile);
+ 	}
+@@ -880,9 +880,9 @@
+ void 
+ CreateLib (void)
+ {
+-  long Codesize;
++  int Codesize;
+   FILE *objectfile = NULL;
+-  long fptr;
++  int fptr;
+   char *filebuffer, *fname;
+ 
+   if (verbose)
+@@ -1035,13 +1035,13 @@
+ 
+ 
+ 
+-long 
++int 
+ ReadLong (FILE * fileid)
+ {
+ 
+ #ifdef ENDIAN			/* high byte, low byte order... */
+   int i;
+-  unsigned long c, fptr = 0;
++  unsigned int c, fptr = 0;
+ 
+   for (i = 1; i <= 3; i++)
+     {
+@@ -1052,7 +1052,7 @@
+ 
+   return fptr;
+ #else /* low byte, high byte order...    */
+-  long fptr = 0;
++  int fptr = 0;
+ 
+   /* long is *at least* 4 bytes long, and we have to write exactly 4 bytes */
+   fread (&fptr, 4, 1, fileid);
+@@ -1063,7 +1063,7 @@
+ 
+ 
+ void 
+-WriteLong (long fptr, FILE * fileid)
++WriteLong (int fptr, FILE * fileid)
+ {
+ #ifdef ENDIAN			/* high byte, low byte order... */
+   int i;
+diff -Naur z88dk-1.8.ds1/src/z80asm/symbol.h z88dk-1.8.ds1-64bit/src/z80asm/symbol.h
+--- z88dk-1.8.ds1/src/z80asm/symbol.h	2003-10-11 17:41:04.000000000 +0200
++++ z88dk-1.8.ds1-64bit/src/z80asm/symbol.h	2010-04-22 13:17:56.000000000 +0200
+@@ -113,7 +113,7 @@
+ 
+ struct libfile      { struct libfile    *nextlib;           /* pointer to next library file in list */
+                       char              *libfilename;       /* filename of library (incl. extension) */
+-                      long              nextobjfile;        /* file pointer to next object file in library */
++                      int               nextobjfile;        /* file pointer to next object file in library */
+                     };
+ 
+ struct linklist     { struct linkedmod  *firstlink;         /* pointer to first linked object module */
+diff -Naur z88dk-1.8.ds1/src/z80asm/z80asm.c z88dk-1.8.ds1-64bit/src/z80asm/z80asm.c
+--- z88dk-1.8.ds1/src/z80asm/z80asm.c	2007-07-22 00:43:35.000000000 +0200
++++ z88dk-1.8.ds1-64bit/src/z80asm/z80asm.c	2010-04-22 13:17:56.000000000 +0200
+@@ -827,7 +827,7 @@
+     }
+   if (*flagid == 'r')
+     {
+-      sscanf (flagid + 1, "%x", &EXPLICIT_ORIGIN);
++      sscanf (flagid + 1, "%lx", &EXPLICIT_ORIGIN);
+       deforigin = ON;		/* explicit origin has been defined */
+       return;
+     }
+diff -Naur z88dk-1.8.ds1/src/z80asm/z80pass.c z88dk-1.8.ds1-64bit/src/z80asm/z80pass.c
+--- z88dk-1.8.ds1/src/z80asm/z80pass.c	2002-05-11 22:09:38.000000000 +0200
++++ z88dk-1.8.ds1-64bit/src/z80asm/z80pass.c	2010-04-22 13:17:56.000000000 +0200
+@@ -853,9 +853,9 @@
+   fprintf (listfile, "%*.*s", 122 - strlen (_prog_name) - strlen (_version) - strlen (_copyright) - 3, strlen (date), date);
+ #else
+   fprintf (listfile, "%s", copyrightmsg);
+-  fprintf (listfile, "%*.*s", (int) 122 - strlen (copyrightmsg), (int) strlen (date), date);
++  fprintf (listfile, "%*.*s", (int) (122 - strlen (copyrightmsg)), (int) strlen (date), date);
+ #endif
+-  fprintf (listfile, "Page %03d%*s'%s'\n\n\n", ++PAGENR, (int) 122 - 9 - 2 - strlen (lstfilename), "", lstfilename);
++  fprintf (listfile, "Page %03d%*s'%s'\n\n\n", ++PAGENR, (int) (122 - 9 - 2 - strlen (lstfilename)), "", lstfilename);
+ }
+ 
+ 
+diff -Naur z88dk/src/sccz80/io.c z88dk-64bit/src/sccz80/io.c
+--- z88dk-1.8.ds1/src/sccz80.orig/io.c	2009-06-21 23:16:52.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/io.c	2009-07-21 05:11:59.000000000 +0200
+@@ -334,7 +334,7 @@
+ }
+ 
+ 
+-void outdec(long number)
++void outdec(int number)
+ {
+         if ( number < 0 ) {
+ 		number=-number;
+@@ -344,7 +344,7 @@
+         outd2(number);
+ }
+ 
+-void outd2(long n)
++void outd2(int n)
+ {
+         if ( n > 9 ) {
+                 outd2(n/10) ;
+diff -Naur  z88dk-1.8.ds1/src/sccz80.orig/io.h z88dk-1.8.ds1/src/sccz80/io.h
+--- z88dk-1.8.ds1/src/sccz80.orig/io.h	2009-06-21 23:16:52.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/io.h	2009-07-21 05:11:59.000000000 +0200
+@@ -26,8 +26,8 @@
+ extern void ol(char *ptr);
+ extern void ot(char *ptr);
+ extern void blanks(void);
+-extern void outdec(long number);
+-extern void outd2(long n);
++extern void outdec(int number);
++extern void outd2(int n);
+ extern void queuelabel(int);
+ 
+ typedef struct {
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/ccdefs.h z88dk-1.8.ds1/src/sccz80/ccdefs.h
+--- z88dk-1.8.ds1/src/sccz80.orig/ccdefs.h	2000-07-04 17:33:30.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/ccdefs.h	2010-04-22 11:49:20.000000000 +0200
+@@ -12,6 +12,9 @@
+  */
+ 
+ 
++#include <sys/types.h>
++#include <stdint.h>
++
+ #include "define.h"
+ #include "lvalue.h"
+ 
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/codegen.c z88dk-1.8.ds1/src/sccz80/codegen.c
+--- z88dk-1.8.ds1/src/sccz80.orig/codegen.c	2007-06-24 16:43:45.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/codegen.c	2010-04-22 12:25:41.000000000 +0200
+@@ -34,8 +34,6 @@
+ 
+ int donelibheader;
+ 
+-void constbc(long val);
+-
+ /* Begin a comment line for the assembler */
+ 
+ void comment(void)
+@@ -1853,13 +1851,13 @@
+  * to have -1 entered correctly
+  */
+ 
+-void vlongconst(unsigned long val)
++void vlongconst(uint32_t val)
+ {
+         vconst(val%65536);
+         const2(val/65536);
+ }
+ 
+-void vlongconst_noalt(unsigned long val)
++void vlongconst_noalt(uint32_t val)
+ {
+     constbc(val%65536);
+     ol("push\tbc");
+@@ -1871,7 +1869,7 @@
+ /*
+  * load constant into primary register
+  */
+-void vconst(long val)
++void vconst(int32_t val)
+ {
+ 	if ( val < 0 )
+ 		val += 65536;
+@@ -1883,7 +1881,7 @@
+ /*
+  * load constant into secondary register
+  */
+-void const2(long val)
++void const2(int32_t val)
+ {
+ 	if ( val < 0 )
+ 		val += 65536;
+@@ -1892,7 +1890,7 @@
+         nl();
+ }
+ 
+-void constbc(long val)
++void constbc(int32_t val)
+ {
+ 	if ( val < 0 )
+ 		val += 65536;
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/codegen.h z88dk-1.8.ds1/src/sccz80/codegen.h
+--- z88dk-1.8.ds1/src/sccz80.orig/codegen.h	2004-03-26 23:06:09.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/codegen.h	2010-04-22 11:49:20.000000000 +0200
+@@ -92,11 +92,11 @@
+ extern void convUlong2doub(void);
+ extern void convdoub2int(void);
+ extern void DoubSwap(void);
+-extern void vlongconst(unsigned long val);
+-extern void vlongconst_noalt(unsigned long val);
+-extern void vconst(long val);
+-extern void const2(long val);
+-extern void constbc(long val);
++extern void vlongconst(uint32_t val);
++extern void vlongconst_noalt(uint32_t val);
++extern void vconst(int32_t val);
++extern void const2(int32_t val);
++extern void constbc(int32_t val);
+ extern void addbchl(int val);
+ extern void GlobalPrefix(char);
+ extern void jumpc(int);
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/const.c z88dk-1.8.ds1/src/sccz80/const.c
+--- z88dk-1.8.ds1/src/sccz80.orig/const.c	2006-06-18 15:03:13.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/const.c	2010-04-22 11:49:20.000000000 +0200
+@@ -54,8 +54,8 @@
+                 return(1);
+         }
+         else if ( number(&lval->const_val) || pstr(&lval->const_val) ) {
+-/* Insert long stuff/long pointer here? */
+-		if ( (unsigned long )lval->const_val >= 65536LU )
++/* Insert int32_t stuff/int32_t pointer here? */
++		if ( (uint32_t )lval->const_val >= 65536LU )
+ 			constype = LONG;
+ 
+                 lval->val_type = constype ;
+@@ -81,7 +81,7 @@
+ }
+ 
+ 
+-int fnumber(long *val)
++int fnumber(int32_t *val)
+ {
+     unsigned char sum[6];
+     unsigned char sum2[6];
+@@ -169,7 +169,7 @@
+ 
+     if( cmatch('e') ) {                       /* interpret exponent */
+ 	int neg;                        /* nonzero if exp is negative */
+-	long expon;                     /* the exponent */
++	int32_t expon;                     /* the exponent */
+ 
+ 	if( number(&expon) == 0 ) {
+ 	    error(E_EXPON);
+@@ -234,7 +234,7 @@
+ int stash_double_str(char *start, char *end)
+ {
+     int  len;
+-    long val;
++    int32_t val;
+     unsigned char  *buf;
+ 
+     len = end-start;
+@@ -259,7 +259,7 @@
+  * number - saves space etc etc
+  */
+ 
+-long searchdub(unsigned char *num)
++int32_t searchdub(unsigned char *num)
+ {
+         unsigned char *tempdub;
+         int dubleft, k,match;
+@@ -290,11 +290,11 @@
+ 
+ 
+ 
+-int number(long *val)
++int number(int32_t *val)
+ {
+         char c ;
+         int minus;
+-        long  k ;
++        int32_t  k ;
+ /*
+  * djm, set the type specifiers to normal
+  */
+@@ -362,14 +362,14 @@
+         immed() ;
+         outname(ptr->name,dopref(ptr)) ;
+         nl();
+-/* djm if we're using long pointers, use of e=0 means absolute address,
++/* djm if we're using int32_t pointers, use of e=0 means absolute address,
+  * this covers up a bit of a problem in deref() which can't distinguish
+  * between ptrtoptr and ptr
+  */
+         if (ptr->flags&FARPTR) { const2(0); }
+ }
+ 
+-int pstr(long *val)
++int pstr(int32_t *val)
+ {
+         int k ;
+ 
+@@ -390,7 +390,7 @@
+  * check to see if present elsewhere, if so do the merge as for doubles
+  */
+ 
+-int tstr(long *val)
++int tstr(int32_t *val)
+ {
+         int k,j;
+ 
+@@ -414,7 +414,7 @@
+  * internally, but to the asm file show it to start from 0
+  */
+ 
+-int storeq(int length, unsigned char *queue,long *val)
++int storeq(int length, unsigned char *queue,int32_t *val)
+ {
+         int     j,k,len;
+ /* Have stashed it in our temporary queue, we know the length, so lets
+@@ -432,7 +432,7 @@
+                 j++;
+         }
+ /* If we get here, then dump it in the queue as per normal... */
+-        *val=(long) litptr-1;
++        *val=(int32_t) litptr-1;
+         for (j=0; j<k; j++) {
+ /* Have to dump it in our special queue here for function literals */
+                 if ( (litptr+1) >= FNMAX ) {
+@@ -445,7 +445,7 @@
+ }
+ 
+ 
+-int qstr(long *val)
++int qstr(int32_t *val)
+ {
+     int c;
+     int cnt=0;
+@@ -453,7 +453,7 @@
+     if ( cmatch('"') == 0 ) 
+ 	return(-1) ;
+ 
+-    *val=(long)gltptr;
++    *val=(int32_t)gltptr;
+     do {
+ 	while ( ch() !='"' ) {
+ 	    if ( ch() == 0 ) break ;
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/const.h z88dk-1.8.ds1/src/sccz80/const.h
+--- z88dk-1.8.ds1/src/sccz80.orig/const.h	2002-05-30 00:54:09.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/const.h	2010-04-22 11:49:20.000000000 +0200
+@@ -1,15 +1,15 @@
+ /* constant.c */
+ extern int constant(LVALUE *lval);
+-extern int fnumber(long *val);
++extern int fnumber(int32_t *val);
+ extern int stash_double_str(char *start,char *end);
+-extern long searchdub(unsigned char *num);
+-extern int number(long *val);
++extern int32_t searchdub(unsigned char *num);
++extern int number(int32_t *val);
+ extern int hex(char c);
+ extern void address(SYMBOL *ptr);
+-extern int pstr(long *val);
+-extern int tstr(long *val);
+-extern int storeq(int length, unsigned char *queue,long *val);
+-extern int qstr(long *val);
++extern int pstr(int32_t *val);
++extern int tstr(int32_t *val);
++extern int storeq(int length, unsigned char *queue,int32_t *val);
++extern int qstr(int32_t *val);
+ extern void stowlit(int value, int size);
+ extern unsigned char litchar(void);
+ extern void size_of(LVALUE *lval);
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/declfunc.c z88dk-1.8.ds1/src/sccz80/declfunc.c
+--- z88dk-1.8.ds1/src/sccz80.orig/declfunc.c	2007-04-17 16:40:14.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/declfunc.c	2010-04-22 11:49:20.000000000 +0200
+@@ -68,7 +68,7 @@
+ char sign,
+ TAG_SYMBOL *otag,
+ int ident,
+-long *addr)
++int32_t *addr)
+ {
+     SYMBOL *ptr;
+     int     more;
+@@ -134,7 +134,7 @@
+ void newfunc()
+ {
+         char n[NAMESIZE];               /* ptr => currfn */
+-        long addr;
++        int32_t addr;
+ 
+         if ( symname(n) == 0 ) {
+                 error(E_ILLEGAL);
+@@ -155,7 +155,7 @@
+ SYMBOL *
+ #endif
+ 
+-AddFuncCode(char *n, char type, char ident, char sign,char zfar, int storage, int more, char check,char simple,TAG_SYMBOL *otag, long *addr)
++AddFuncCode(char *n, char type, char ident, char sign,char zfar, int storage, int more, char check,char simple,TAG_SYMBOL *otag, int32_t *addr)
+ {
+     unsigned char tvalue;           /* Used to hold protot value */
+     char    typ;                    /* Temporary type */
+@@ -468,7 +468,7 @@
+ #ifndef SMALL_C
+ SYMBOL *
+ #endif
+-dofnansi(SYMBOL *currfn, long *addr)
++dofnansi(SYMBOL *currfn, int32_t *addr)
+ {
+         SYMBOL *prevarg;       /* ptr to symbol table entry of most recent argument */
+         SYMBOL *argptr;        /* Temporary holder.. */
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/declfunc.h z88dk-1.8.ds1/src/sccz80/declfunc.h
+--- z88dk-1.8.ds1/src/sccz80.orig/declfunc.h	2007-04-17 16:40:15.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/declfunc.h	2010-04-22 11:49:20.000000000 +0200
+@@ -1,10 +1,10 @@
+ /* declfunc.c */
+ 
+-extern int AddNewFunc(char *sname, int type, int storage, char zfar, char sign, TAG_SYMBOL *otag, int ident, long *addr);
++extern int AddNewFunc(char *sname, int type, int storage, char zfar, char sign, TAG_SYMBOL *otag, int ident, int32_t *addr);
+ extern void newfunc(void);
+-extern SYMBOL *AddFuncCode(char *n, char type, char ident, char sign, char zfar, int storage, int more, char check, char simple, TAG_SYMBOL *otag, long *addr);
++extern SYMBOL *AddFuncCode(char *n, char type, char ident, char sign, char zfar, int storage, int more, char check, char simple, TAG_SYMBOL *otag, int32_t *addr);
+ extern void DoFnKR(SYMBOL *currfn, char simple);
+ extern void setlocvar(SYMBOL *prevarg, SYMBOL *currfn);
+-extern SYMBOL *dofnansi(SYMBOL *currfn, long *addr);
++extern SYMBOL *dofnansi(SYMBOL *currfn, int32_t *addr);
+ extern int CheckANSI(void);
+ extern SYMBOL *getarg(int typ, TAG_SYMBOL *otag, int deftype, SYMBOL *prevarg, char issigned, char zfar, char proto);
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/declinit.c z88dk-1.8.ds1/src/sccz80/declinit.c
+--- z88dk-1.8.ds1/src/sccz80.orig/declinit.c	2004-03-26 23:06:09.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/declinit.c	2010-04-22 11:49:20.000000000 +0200
+@@ -222,8 +222,8 @@
+  */
+ void init(int size, int ident, int *dim, int more, int dump, int is_struct)
+ {
+-    long value;
+-    int sz;			/* number of chars in queue */
++    int32_t value;
++    int     sz;			/* number of chars in queue */
+ /*
+  * djm 14/3/99 We have to rewrite this bit (ugh!) so that we store
+  * our literal in a temporary queue, then if needed, we then dump
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/declvar.c z88dk-1.8.ds1/src/sccz80/declvar.c
+--- z88dk-1.8.ds1/src/sccz80.orig/declvar.c	2007-07-05 20:39:00.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/declvar.c	2010-04-22 11:49:20.000000000 +0200
+@@ -130,7 +130,7 @@
+ {
+     SYMBOL  *ptr;
+     char    name[NAMEMAX];
+-    long    value;
++    int32_t value;
+     /* Add it into the symbol table, we do not need to keep track of the
+      * tag because we treat enums as constants
+      */
+@@ -198,7 +198,7 @@
+ {
+     char sname[NAMESIZE];
+     int size, ident, more, itag, type, size_st;
+-    long addr = -1;
++    int32_t addr = -1;
+     char    flagdef,match,ptrtofn;
+     char    libdef,fastcall,callee;
+     SYMBOL *myptr ;
+@@ -745,7 +745,7 @@
+ int 
+ needsub (void)
+ {
+-        long num;
++        int32_t num;
+ 
+         if ( cmatch(']') ) return (0);   /* null size */
+         if ( constexpr(&num,1) == 0 ) {
+@@ -850,7 +850,7 @@
+ void 
+ BitFieldSwallow (void)
+ {
+-        long    val;
++        int32_t val;
+         if      (cmatch(':')) {
+                 constexpr(&val,1);
+                 warning(W_BITFIELD);
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/define.h z88dk-1.8.ds1/src/sccz80/define.h
+--- z88dk-1.8.ds1/src/sccz80.orig/define.h	2007-01-10 10:43:24.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/define.h	2010-04-22 11:49:20.000000000 +0200
+@@ -205,7 +205,7 @@
+ 
+ struct sw_tab {
+         int label ;             /* label for start of case */
+-        long value ;             /* value associated with case */
++        int32_t value ;             /* value associated with case */
+ } ;
+ 
+ #define SW_TAB struct sw_tab
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/float.c z88dk-1.8.ds1/src/sccz80/float.c
+--- z88dk-1.8.ds1/src/sccz80.orig/float.c	2002-02-20 12:11:54.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/float.c	2010-04-22 11:49:20.000000000 +0200
+@@ -40,7 +40,7 @@
+  * Entry: val=value fa=pointer to 6 byte area for number */
+ void qfloat(int va, unsigned char *fa)
+ {
+-    unsigned long val;
++    uint32_t val;
+     int      i,minus,exp;
+ 
+     val = va;
+@@ -58,9 +58,9 @@
+ }
+ 
+ 
+-void norm(unsigned long a, 
+-	  unsigned long b, 
+-	  unsigned long c, 
++void norm(uint32_t a, 
++	  uint32_t b, 
++	  uint32_t c, 
+ 	  int minus,
+ 	  unsigned char *fa, 
+ 	  int exp)
+@@ -183,7 +183,7 @@
+ 
+     unsigned char fa1[EXPONENT+2], fa2[EXPONENT+2], fa3[EXPONENT+2];
+     int i, j, k, temp, mask, carry;
+-    unsigned long a, b, c;
++    uint32_t a, b, c;
+     int     exp;
+ 
+     unpack(i1, fa1);
+@@ -256,7 +256,7 @@
+ void fltadd(unsigned char *i1,unsigned char *i2)
+ {
+     unsigned char fa1[EXPONENT+2], fa2[EXPONENT+2];
+-    unsigned long temp, carry;
++    uint32_t temp, carry;
+     int i;
+ 
+ 
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/float.h z88dk-1.8.ds1/src/sccz80/float.h
+--- z88dk-1.8.ds1/src/sccz80.orig/float.h	2002-01-27 16:47:59.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/float.h	2010-04-22 11:49:20.000000000 +0200
+@@ -4,4 +4,4 @@
+ extern void fltmult(unsigned char *, unsigned char *);
+ extern void pack(unsigned char *, unsigned char *);
+ extern void unpack(unsigned char *, unsigned char *);
+-extern void norm(unsigned long, unsigned long, unsigned long, int, unsigned char *, int);
++extern void norm(uint32_t, uint32_t, uint32_t, int, unsigned char *, int);
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/lvalue.h z88dk-1.8.ds1/src/sccz80/lvalue.h
+--- z88dk-1.8.ds1/src/sccz80.orig/lvalue.h	2007-06-24 16:43:45.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/lvalue.h	2010-04-22 11:49:20.000000000 +0200
+@@ -9,7 +9,7 @@
+     int indirect ;                  /* type of indirect object, 0 for static object */
+     int ptr_type ;                  /* type of pointer or array, 0 for other idents */
+     int is_const ;                  /* true if constant expression */
+-    signed long const_val ;                        /* value of constant expression (& other uses) */
++    int32_t const_val ;                        /* value of constant expression (& other uses) */
+     TAG_SYMBOL *tagsym ;    /* tag symbol address, 0 if not struct */
+     void (*binop)() ;                /* function address of highest/last binary operator */
+     char *stage_add ;               /* stage addess of "oper 0" code, else 0 */
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/main.c z88dk-1.8.ds1/src/sccz80/main.c
+--- z88dk-1.8.ds1/src/sccz80.orig/main.c	2007-10-07 18:16:03.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/main.c	2010-04-22 11:49:20.000000000 +0200
+@@ -623,7 +623,7 @@
+ {
+     FILE   *fp;
+     char   sname[NAMESIZE];
+-    long    value;
++    int32_t value;
+     int     count;
+ 
+     if ( symname(sname) ) {
+@@ -642,7 +642,7 @@
+ 	    else
+ 		fprintf(fp,",");
+ 	    if ( number(&value) ) {
+-		fprintf(fp,"%ld",value);
++		fprintf(fp,"%d",value);
+ 	    } else {
+ 		warning(W_EXPARG);
+ 	    }
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/primary.c z88dk-1.8.ds1/src/sccz80/primary.c
+--- z88dk-1.8.ds1/src/sccz80.orig/primary.c	2007-07-05 20:39:00.000000000 +0200
++++ z88dk-1.8.ds1/src/sccz80/primary.c	2010-04-22 11:49:20.000000000 +0200
+@@ -649,7 +649,7 @@
+  * evaluate constant expression
+  * return TRUE if it is a constant expression
+  */
+-int constexpr(long *val,int flag)
++int constexpr(int32_t *val,int flag)
+ {
+         char *before, *start ;
+         int con, valtemp ;
+@@ -739,7 +739,7 @@
+ 	SYMBOL  *ptr;
+     char    temp_type;
+     int     itag;
+-    char    nam[20];
++    char    nam[64];
+ 
+ 
+ 
+@@ -794,7 +794,7 @@
+  * returning pointers - to do this, we will define dummy symbols in
+  * the local symbol table so that they do what we want them to do!
+  */
+-    sprintf(nam,"0dptr%d",(int)locptr);
++    sprintf(nam,"0dptr%p",locptr);
+     temp_type = ( (lval->c_flags&FARPTR) ? CPTR : CINT );
+     itag=0;
+     if ( lval->c_tag) 
+diff -Naur z88dk-1.8.ds1/src/sccz80.orig/primary.h z88dk-1.8.ds1/src/sccz80/primary.h
+--- z88dk-1.8.ds1/src/sccz80.orig/primary.h	2001-02-02 13:24:06.000000000 +0100
++++ z88dk-1.8.ds1/src/sccz80/primary.h	2010-04-22 11:49:20.000000000 +0200
+@@ -20,7 +20,7 @@
+ extern void rvalload(LVALUE  *lval);
+ extern void rvalue(LVALUE *lval);
+ extern void test(int label, int parens);
+-extern int constexpr(long *val,int flag);
++extern int constexpr(int32_t *val,int flag);
+ extern void cscale(int type, struct tag_symbol *tag, int *val);
+ extern void addconst(int val, int opr, char zfar);
+ extern int docast(LVALUE *lval,char df);
--- z88dk-1.8.ds1.orig/debian/patches/03_libsrc_graphics_x11_Makefile.diff
+++ z88dk-1.8.ds1/debian/patches/03_libsrc_graphics_x11_Makefile.diff
@@ -0,0 +1,60 @@
+--- z88dk-1.8.ds1/libsrc/graphics/x11/Makefile.orig	2008-03-05 22:25:11.000000000 +0100
++++ z88dk-1.8.ds1/libsrc/graphics/x11/Makefile	2008-03-14 17:52:18.000000000 +0100
+@@ -5,9 +5,55 @@
+ 
+ include ../../Make.config
+ 
+-all:	
+-	zcc +test $(CFLAGS) *.c
++CFILES = \
++	blackpixel.c \
++	defaultdepth.c \
++	defaultscreen.c \
++	displayheight.c \
++	displaywidth.c \
++	rootwindow.c \
++	whitepixel.c \
++	xchecktypedevent.c \
++	xcheckwindowevent.c \
++	xclearwindow.c \
++	xclosedisplay.c \
++	xcreatebitmapfromdata.c \
++	xcreategc.c \
++	xcreatesimplewindow.c \
++	xdestroywindow.c \
++	xdisplayname.c \
++	xdrawline.c \
++	xdrawpoint.c \
++	xdrawrectangle.c \
++	xdrawstring.c \
++	_xfindchar.c \
++	xflush.c \
++	_xfputc.c \
++	xfreegc.c \
++	xloadqueryfont.c \
++	xmapwindow.c \
++	xnextevent.c \
++	xopendisplay.c  \
++	xselectinput.c \
++	xsetdashes.c \
++	xsetfont.c \
++	xsetforeground.c \
++	xsetlineattributes.c \
++	xsetstandardproperties.c \
++	xtextwidth.c \
++	xunloadfont.c 
++
++
++AFILES  = $(CFILES:.c=.asm)
++OBJECTS = $(CFILES:.c=.o)
++
++all: x11lib
++
++x11lib: $(OBJECTS)
+ 	$(LIBLINKER) -x../../x11.lib @x11.lst
+ 
++.c.o:
++	zcc +test $(CFLAGS) $*.c
++
+ clean:
+ 	$(RM) *.o* zcc_opt.def
--- z88dk-1.8.ds1.orig/debian/patches/05_src_z80asm_z80pass.c.diff
+++ z88dk-1.8.ds1/debian/patches/05_src_z80asm_z80pass.c.diff
@@ -0,0 +1,29 @@
+--- z88dk-1.8.ds1/src/z80asm/z80pass.c.orig	2009-12-01 20:44:29.000000000 +0000
++++ z88dk-1.8.ds1/src/z80asm/z80pass.c	2009-12-01 20:45:06.000000000 +0000
+@@ -94,7 +94,7 @@
+ /* local functions */
+ void ifstatement (enum flag interpret);
+ void parseline (enum flag interpret);
+-void getline (void);
++void getline_z88dk (void);
+ void Pass2info (struct expr *expression, char constrange, long lfileptr);
+ void Z80pass1 (void);
+ void Z80pass2 (void);
+@@ -165,7 +165,7 @@
+ 
+ 
+ void 
+-getline (void)
++getline_z88dk (void)
+ {
+   long fptr;
+   int l,c;
+@@ -198,7 +198,7 @@
+       ++CURRENTFILE->line;
+       ++TOTALLINES;
+       if (listing)
+-	getline ();		/* get a copy of current source line */
++	getline_z88dk ();		/* get a copy of current source line */
+ 
+       EOL = OFF;		/* reset END OF LINE flag */
+       GetSym ();
--- z88dk-1.8.ds1.orig/debian/patches/03_libsrc_oz_ozinput_Makefile.diff
+++ z88dk-1.8.ds1/debian/patches/03_libsrc_oz_ozinput_Makefile.diff
@@ -0,0 +1,11 @@
+--- z88dk-1.8.ds1/libsrc/oz/ozinput/Makefile.orig	2008-03-14 17:17:16.000000000 +0100
++++ z88dk-1.8.ds1/libsrc/oz/ozinput/Makefile	2008-03-14 17:17:23.000000000 +0100
+@@ -6,7 +6,7 @@
+ include ../../Make.config
+ 
+ all:	
+-	zcc +ozxansi $(CFLAGS) *.c
++	zcc +ozansi $(CFLAGS) *.c
+ 
+ clean:
+ 	$(RM) *.o* zcc_opt.def