--- z80asm-1.7.orig/z80asm.1
+++ z80asm-1.7/z80asm.1
@@ -308,20 +308,9 @@
 
 .SH BUGS
 If you find a bug, or want to send comments, please use the web interface at
-.nh
-http://savannah.nongnu.org/projects/z80asm/
-.ny
-or send an e\-mail to
-.nh
-wijnen@debian.org.
-.ny
+http://savannah.nongnu.org/projects/z80asm/ or send an e\-mail to
+wijnen@debian.org
 
 .SH AUTHOR
-Z80asm was written by Bas Wijnen
-.nh
-<wijnen@debian.org>.
-.hy
-Some patches were provided by Jan Wilmans
-.nh
-<jw@dds.nl>
-.hy
+Z80asm was written by Bas Wijnen <wijnen@debian.org>.
+Some patches were provided by Jan Wilmans <jw@dds.nl>
--- z80asm-1.7.orig/debian/changelog
+++ z80asm-1.7/debian/changelog
@@ -0,0 +1,50 @@
+z80asm (1.7-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #512226)
+  * Update to debhelper 1.7; turn debian/rules into a one-liner.
+  * Add install target to upstream Makefile to allow new rules file to work.
+
+ -- Bas Wijnen <wijnen@debian.org>  Tue, 17 Feb 2009 21:54:30 +0100
+
+z80asm (1.6-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #428821, #431017)
+  * Update debian/copyright to GPL version 3 or later.
+  * Don't ignore errors from make clean.
+
+ -- Bas Wijnen <wijnen@debian.org>  Mon, 10 Sep 2007 00:42:01 +0200
+
+z80asm (1.5-1) unstable; urgency=high
+
+  * New upstream release.
+  * High urgency, because it the fix for #427614, which is RC, has not yet
+    migrated to testing.
+
+ -- Bas Wijnen <wijnen@debian.org>  Thu, 14 Jun 2007 12:38:47 +0200
+
+z80asm (1.4-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #427614)
+
+ -- Bas Wijnen <wijnen@debian.org>  Thu, 07 Jun 2007 10:58:09 +0200
+
+z80asm (1.3-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #423917, #423910)
+  * Update standards version to 3.7.2.  (No changes needed.)
+  * Add watch file.
+
+ -- Bas Wijnen <wijnen@debian.org>  Thu, 24 May 2007 14:27:38 +0200
+
+z80asm (1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Bas Wijnen <shevek@fmf.nl>  Fri, 13 May 2005 14:40:33 +0200
+
+z80asm (1.1-1) unstable; urgency=low
+
+  * Initial Release.  (Closes: #308310)
+
+ -- Bas Wijnen <shevek@fmf.nl>  Thu, 12 May 2005 00:48:57 +0200
+
--- z80asm-1.7.orig/debian/compat
+++ z80asm-1.7/debian/compat
@@ -0,0 +1 @@
+7
--- z80asm-1.7.orig/debian/copyright
+++ z80asm-1.7/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Bas Wijnen <wijnen@debian.org> on
+Tue,  3 May 2005 15:01:11 +0200.
+
+It was downloaded from http://download.savannah.nongnu.org/releases/z80asm/.
+
+   Copyright (C) 2002-2009 Bas Wijnen <wijnen@debian.org>
+   Copyright (C) 2005 Jan Wilmans <jw@dds.nl>
+
+   Z80asm is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   Z80asm is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, version 3 of the GPL license can be found in
+/usr/share/common-licenses/GPL-3 .
+The latest version of the GPL can be found in
+/usr/share/common-licenses/GPL .
+
+Note that you can either choose version 3 of the GPL, or any later version
+of the license, as published by the Free Software Foundation.  Links to
+currently released versions are listed above for your convenience only.
--- z80asm-1.7.orig/debian/control
+++ z80asm-1.7/debian/control
@@ -0,0 +1,26 @@
+Source: z80asm
+Section: devel
+Priority: optional
+Maintainer: Bas Wijnen <wijnen@debian.org>
+Build-Depends: debhelper (>= 7.0.0)
+Standards-Version: 3.8.0
+Homepage: http://www.nongnu.org/z80asm/
+
+Package: z80asm
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: openmsx
+Description: assembler for the Zilog Z80 microprocessor
+ The Z80 microprocessor is used in old home computers, such as the
+ ZX spectrum and MSX, and in several newer devices, such as the TI-83
+ graphical calculator and (a stripped down version) in the (original) GameBoy.
+ .
+ This assembler is meant for developers who write code (in assembly) for
+ such devices.
+ .
+ Features include:
+  * macros
+  * including other sources
+  * complex expressions (similar to bash)
+  * labels of unlimited length
+  * conditional compilation depending on expressions
--- z80asm-1.7.orig/debian/rules
+++ z80asm-1.7/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
--- z80asm-1.7.orig/debian/watch
+++ z80asm-1.7/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.savannah.nongnu.org/releases/z80asm/z80asm-(.*\..*)\.tar\.gz
--- z80asm-1.7.orig/debian/z80asm.install
+++ z80asm-1.7/debian/z80asm.install
@@ -0,0 +1 @@
+z80asm	usr/bin
--- z80asm-1.7.orig/debian/z80asm.manpages
+++ z80asm-1.7/debian/z80asm.manpages
@@ -0,0 +1 @@
+z80asm.1