diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/control dosemu-1.2.2/debian/control
--- org/dosemu-1.2.2/debian/control	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/control	2006-06-17 23:09:45.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Bart Martens <bart.martens@advalvas.be>
 Standards-Version: 3.6.2.2
-Build-Depends: autoconf, bin86, bison, bsdmainutils, debhelper (>= 4), flex, libx11-dev, libxext-dev, libxxf86vm-dev, libice-dev, libslang2-dev, xutils, dpatch
+Build-Depends: autoconf, bin86, bison, bsdmainutils, debhelper (>= 4), dpatch, fakeroot, flex, gawk, imake, libgpmg1-dev, libice-dev, libslang2-dev, libx11-dev, libxext-dev, libxt-dev, libxxf86vm-dev, m4, x11proto-core-dev, x11proto-kb-dev, x11proto-xext-dev, x11proto-xf86vidmode-dev, xutils
 
 Package: dosemu
 Architecture: i386
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/dosemu.postinst dosemu-1.2.2/debian/dosemu.postinst
--- org/dosemu-1.2.2/debian/dosemu.postinst	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/dosemu.postinst	2006-06-18 12:09:00.000000000 +0200
@@ -1,18 +1,50 @@
-#!/bin/sh
+#! /bin/sh
+# postinst script for #PACKAGE#
 #
-# post-install script for the Debian GNU/Linux dosemu package
-#
-# $Id: dosemu.postinst,v 1.5 2003/06/21 05:50:00 herbert Exp $
+# see: dh_installdeb(1)
 
 set -e
 
-if
-	[ "$1" = configure ] && {
-		[ -z "$2" ] || dpkg --compare-versions "$2" lt 1.0.2-6
-	} && [ ! -e /var/lib/dosemu/freedos ] &&
-	[ ! -L /var/lib/dosemu/freedos ]
-then
-	ln -s /usr/lib/freedos /var/lib/dosemu
-fi
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+	if
+		[ "$1" = configure ] && {
+			[ -z "$2" ] || dpkg --compare-versions "$2" lt 1.0.2-6
+		} && [ ! -e /var/lib/dosemu/freedos ] &&
+		[ ! -L /var/lib/dosemu/freedos ]
+	then
+		ln -s /usr/lib/freedos /var/lib/dosemu
+	fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
 
 #DEBHELPER#
+
+exit 0
+
+
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/dosemu.postrm dosemu-1.2.2/debian/dosemu.postrm
--- org/dosemu-1.2.2/debian/dosemu.postrm	1970-01-01 01:00:00.000000000 +0100
+++ dosemu-1.2.2/debian/dosemu.postrm	2006-06-18 12:08:55.000000000 +0200
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+	purge)
+		rm -rf /etc/dosemu
+
+		if [ -L /var/lib/dosemu/freedos ]
+		then
+			rm -f /var/lib/dosemu/freedos
+		fi
+		rmdir /var/lib/dosemu 2> /dev/null || true
+
+	;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/dosemu.preinst dosemu-1.2.2/debian/dosemu.preinst
--- org/dosemu-1.2.2/debian/dosemu.preinst	1970-01-01 01:00:00.000000000 +0100
+++ dosemu-1.2.2/debian/dosemu.preinst	2006-06-18 12:08:49.000000000 +0200
@@ -0,0 +1,74 @@
+#!/bin/sh
+# $Id: preinst,v 1.15 2001/12/20 06:32:02 herbert Exp $
+#
+# pre-install script for the Debian GNU/Linux dosemu package
+#
+
+set -e
+
+check_kernel_version() {
+	KVERSION=`uname -r`
+	dpkg --compare-versions $KVERSION ge 2.1.15 ||
+		(dpkg --compare-versions $KVERSION lt 2.1.0 &&
+		dpkg --compare-versions $KVERSION ge 2.0.28) ||
+		(echo "Your kernel must be >= 2.0.28 or >= 2.1.15!";
+		exit 1)
+}
+
+check_kernel_version
+
+case "$1" in
+upgrade)
+	if dpkg --compare-versions "$2" lt 0.66.7-1; then
+		if [ -f /var/lib/dosemu/hdimage -a ! -f /var/lib/dosemu/hdimage.first ]; then
+			cp -p /var/lib/dosemu/hdimage /var/lib/dosemu/hdimage.first
+		fi
+
+		# Old versions of dosemu need special care.
+		if dpkg --compare-versions "$2" lt 0.66 && [ -L /etc/dosemu/conf -a `ls -l /etc/dosemu/conf | sed 's/.* //'` = "dist" ]; then
+			rm -f /etc/dosemu/conf
+			cp -a /usr/lib/dosemu/config.dist /etc/dosemu/conf
+		fi
+
+		# See if the conf is a link pointing to
+		# ../../usr/lib/dosemu/config.dist.
+		if [ -L /etc/dosemu/conf -a `ls -l /etc/dosemu/conf | sed 's/.* //'` = "../../usr/lib/dosemu/config.dist" ]; then
+			rm -f /etc/dosemu/conf
+			cp -a /usr/lib/dosemu/config.dist /etc/dosemu/conf
+		fi
+	fi
+	if dpkg --compare-versions "$2" lt 1.0.0-1; then
+		# We're now renaming conf/users in the hope that upstream might
+		# eventually use /etc/dosemu as the primary location.
+		if
+			[ ! -e /etc/dosemu/dosemu.conf ] &&
+			[ -e /etc/dosemu/conf ]
+		then
+			mv /etc/dosemu/conf /etc/dosemu/dosemu.conf
+		fi
+		if
+			[ ! -e /etc/dosemu/dosemu.users ] &&
+			[ -e /etc/dosemu/users ]
+		then
+			mv /etc/dosemu/users /etc/dosemu/dosemu.users
+		fi
+	fi
+	if
+		dpkg --compare-versions "$2" lt 1.0.2-3 &&
+		dpkg --compare-versions "$2" ge 1.0.2-1
+	then
+		# Dpkg can't replace symlinks with directories.
+		[ -h /usr/lib/freedos/dosemu ] && rm /usr/lib/freedos/dosemu
+	fi
+	;;
+install | abort-upgrade)
+	;;
+*)
+	echo "$0: incorrect arguments: $*" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+:
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/postrm dosemu-1.2.2/debian/postrm
--- org/dosemu-1.2.2/debian/postrm	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-#!/bin/sh
-# $Id: postrm,v 1.14 2001/02/18 05:06:43 herbert Exp $
-#
-# post-removal script for the Debian GNU/Linux dosemu package
-#
-
-set -e
-
-case "$1" in
-abort-upgrade | abort-install)
-	;;
-remove)
-	;;
-upgrade | failed-upgrade | disappear)
-	;;
-purge)
-	rm -rf /etc/dosemu
-
-	if [ -L /var/lib/dosemu/freedos ]
-	then
-		rm -f /var/lib/dosemu/freedos
-	fi
-	rmdir /var/lib/dosemu 2> /dev/null || true
-
-	;;
-*)
-	echo "$0: incorrect arguments: $*" >&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-exit 0
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/preinst dosemu-1.2.2/debian/preinst
--- org/dosemu-1.2.2/debian/preinst	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-#!/bin/sh
-# $Id: preinst,v 1.15 2001/12/20 06:32:02 herbert Exp $
-#
-# pre-install script for the Debian GNU/Linux dosemu package
-#
-
-set -e
-
-check_kernel_version() {
-	KVERSION=`uname -r`
-	dpkg --compare-versions $KVERSION ge 2.1.15 ||
-		(dpkg --compare-versions $KVERSION lt 2.1.0 &&
-		dpkg --compare-versions $KVERSION ge 2.0.28) ||
-		(echo "Your kernel must be >= 2.0.28 or >= 2.1.15!";
-		exit 1)
-}
-
-check_kernel_version
-
-case "$1" in
-upgrade)
-	if dpkg --compare-versions "$2" lt 0.66.7-1; then
-		if [ -f /var/lib/dosemu/hdimage -a ! -f /var/lib/dosemu/hdimage.first ]; then
-			cp -p /var/lib/dosemu/hdimage /var/lib/dosemu/hdimage.first
-		fi
-
-		# Old versions of dosemu need special care.
-		if dpkg --compare-versions "$2" lt 0.66 && [ -L /etc/dosemu/conf -a `ls -l /etc/dosemu/conf | sed 's/.* //'` = "dist" ]; then
-			rm -f /etc/dosemu/conf
-			cp -a /usr/lib/dosemu/config.dist /etc/dosemu/conf
-		fi
-
-		# See if the conf is a link pointing to
-		# ../../usr/lib/dosemu/config.dist.
-		if [ -L /etc/dosemu/conf -a `ls -l /etc/dosemu/conf | sed 's/.* //'` = "../../usr/lib/dosemu/config.dist" ]; then
-			rm -f /etc/dosemu/conf
-			cp -a /usr/lib/dosemu/config.dist /etc/dosemu/conf
-		fi
-	fi
-	if dpkg --compare-versions "$2" lt 1.0.0-1; then
-		# We're now renaming conf/users in the hope that upstream might
-		# eventually use /etc/dosemu as the primary location.
-		if
-			[ ! -e /etc/dosemu/dosemu.conf ] &&
-			[ -e /etc/dosemu/conf ]
-		then
-			mv /etc/dosemu/conf /etc/dosemu/dosemu.conf
-		fi
-		if
-			[ ! -e /etc/dosemu/dosemu.users ] &&
-			[ -e /etc/dosemu/users ]
-		then
-			mv /etc/dosemu/users /etc/dosemu/dosemu.users
-		fi
-	fi
-	if
-		dpkg --compare-versions "$2" lt 1.0.2-3 &&
-		dpkg --compare-versions "$2" ge 1.0.2-1
-	then
-		# Dpkg can't replace symlinks with directories.
-		[ -h /usr/lib/freedos/dosemu ] && rm /usr/lib/freedos/dosemu
-	fi
-	;;
-install | abort-upgrade)
-	;;
-*)
-	echo "$0: incorrect arguments: $*" >&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-:
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/rules dosemu-1.2.2/debian/rules
--- org/dosemu-1.2.2/debian/rules	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/rules	2006-06-17 23:44:40.000000000 +0200
@@ -65,13 +65,13 @@
 	cp -p etc/dosemu.alias \
 		debian/xfonts-dosemu/etc/X11/fonts/misc/xfonts-dosemu.alias
 	bdftopcf etc/vga.bdf | gzip --best \
-		> debian/xfonts-dosemu/usr/X11R6/lib/X11/fonts/misc/vga.pcf.gz
+		> debian/xfonts-dosemu/usr/share/X11/fonts/misc/vga.pcf.gz
 	bdftopcf etc/vga11x19.bdf | gzip --best \
-		> debian/xfonts-dosemu/usr/X11R6/lib/X11/fonts/misc/dosemu-vga11x19.pcf.gz
+		> debian/xfonts-dosemu/usr/share/X11/fonts/misc/dosemu-vga11x19.pcf.gz
 	bdftopcf etc/vga-cp866.bdf | gzip --best \
-		> debian/xfonts-dosemu/usr/X11R6/lib/X11/fonts/misc/vga-cp866.pcf.gz
+		> debian/xfonts-dosemu/usr/share/X11/fonts/misc/vga-cp866.pcf.gz
 	bdftopcf etc/vga10x20-cp866.bdf | gzip --best \
-		> debian/xfonts-dosemu/usr/X11R6/lib/X11/fonts/misc/vga10x20-cp866.pcf.gz
+		> debian/xfonts-dosemu/usr/share/X11/fonts/misc/vga10x20-cp866.pcf.gz
 
 # Build architecture-independent files here.
 binary-indep: install
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/xfonts-dosemu.dirs dosemu-1.2.2/debian/xfonts-dosemu.dirs
--- org/dosemu-1.2.2/debian/xfonts-dosemu.dirs	2006-06-18 12:00:29.000000000 +0200
+++ dosemu-1.2.2/debian/xfonts-dosemu.dirs	2006-06-17 23:32:16.000000000 +0200
@@ -1,2 +1,2 @@
 etc/X11/fonts/misc
-usr/X11R6/lib/X11/fonts/misc
+usr/share/X11/fonts/misc
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/xfonts-dosemu.postinst dosemu-1.2.2/debian/xfonts-dosemu.postinst
--- org/dosemu-1.2.2/debian/xfonts-dosemu.postinst	1970-01-01 01:00:00.000000000 +0100
+++ dosemu-1.2.2/debian/xfonts-dosemu.postinst	2006-06-18 12:09:04.000000000 +0200
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postinst script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff -aurN --exclude='*~' --exclude=changelog org/dosemu-1.2.2/debian/xfonts-dosemu.postrm dosemu-1.2.2/debian/xfonts-dosemu.postrm
--- org/dosemu-1.2.2/debian/xfonts-dosemu.postrm	1970-01-01 01:00:00.000000000 +0100
+++ dosemu-1.2.2/debian/xfonts-dosemu.postrm	2006-06-18 12:09:08.000000000 +0200
@@ -0,0 +1,38 @@
+#! /bin/sh
+# postrm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0