--- imaptool-0.9.orig/imaptool.man
+++ imaptool-0.9/imaptool.man
@@ -1,4 +1,4 @@
-.TH IMAPTOOL 1x 
+.TH IMAPTOOL 1
 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
 .\" other parms are allowed: see man(7), man(1)
 .SH NAME
--- imaptool-0.9.orig/dgif_lib.c
+++ imaptool-0.9/dgif_lib.c
@@ -14,7 +14,6 @@
 #ifdef __MSDOS__
 #include <io.h>
 #include <alloc.h>
-#include <stdlib.h>
 #include <sys\stat.h>
 #else
 #include <sys/types.h>
@@ -23,6 +22,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "gif_lib.h"
 #include "gif_hash.h"
--- imaptool-0.9.orig/Makefile
+++ imaptool-0.9/Makefile
@@ -1,26 +1,39 @@
-#Do you want to use jpeg-library???
-JPEG_INCLUDE=-I/usr/local/include/
+#Do you want to use jpeg-library??? 
+JPEG_INCLUDE=-I/usr/include/
 JPEG_CHOICE=-DUSE_JPEG_LIB $(JPEG_INCLUDE)
 #JPEG_CHOICE=
 LIBRARIES=-lXt -lXaw -lXmu -lXext -lX11 -ljpeg -lm
 #LIBRARIES=-lXt -lXaw -lXmu -lXext -lX11 -lm
 
 CC=gcc -I/usr/X11R6/include/
+CFLAGS=-g -Wall
 
-LIBDIR=-L/usr/local/lib -L/usr/X11R6/lib
+BINDIR=/usr/bin
+MANDIR=/usr/share/man/man1
+INSTALLFLAGS= -c
+INSTPGMFLAGS= -s
+INSTBINFLAGS= -m 0755
+INSTMANFLAGS= -m 0644
+
+LIBDIR=-L/usr/lib -L/usr/X11R6/lib
 OBJECTS=imaptool.o file2pixmap.o dgif_lib.o gif_err.o gifalloc.o
 imaptool:	$(OBJECTS)
-		$(CC) -o imaptool $(LIBDIR) $(OBJECTS) $(LIBRARIES) 
+		$(CC) -g -o imaptool $(LIBDIR) $(OBJECTS) $(LIBRARIES) 
 imaptool.o:	imaptool.c icon iconmask
-		$(CC) -c imaptool.c
+		$(CC) $(CFLAGS) -c imaptool.c
 file2pixmap.o:	file2pixmap.c
-		$(CC) -c file2pixmap.c $(JPEG_CHOICE)
+		$(CC) $(CFLAGS) -c file2pixmap.c $(JPEG_CHOICE)
 dgif_lib.o:	dgif_lib.c
-		$(CC) -c dgif_lib.c
+		$(CC) $(CFLAGS) -c dgif_lib.c
 gif_err.o:	gif_err.c
-		$(CC) -c gif_err.c
+		$(CC) $(CFLAGS) -c gif_err.c
 gifalloc.o:	gifalloc.c
-		$(CC) -c gifalloc.c
+		$(CC) $(CFLAGS) -c gifalloc.c
+
+install:
+	install $(INSTALLFLAGS) $(INSTPGMFLAGS) $(INSTBINFLAGS) imaptool $(DESTDIR)$(BINDIR)/imaptool
+	install $(INSTALLFLAGS) $(INSTMANFLAGS) imaptool.man $(DESTDIR)$(MANDIR)/imaptool.1
+
 
 clean:
-	rm $(OBJECTS) imaptool
+	rm -f $(OBJECTS) imaptool
--- imaptool-0.9.orig/imaptool.c
+++ imaptool-0.9/imaptool.c
@@ -751,13 +751,13 @@
 	char *mapname = NULL;
 
 	mapname = strrchr(picturefilename,'/');
-        if (!mapname) {
-		printf("unexpected error\n");
-		return;
-        }
-
-	/* skip over the "\" */
-	mapname++;
+	if (mapname) {
+		/* skip over the "/" */
+		mapname++;
+	}
+	else {
+		mapname = picturefilename;
+	}
 
 	if (outputHtmlInLowerCase) {
 		printf("<map name=\"map-%s\">\n",mapname);
--- imaptool-0.9.orig/gifalloc.c
+++ imaptool-0.9/gifalloc.c
@@ -10,6 +10,8 @@
 * 15 Sep 92 - Version 1.0 by Eric Raymond.				     *
 *****************************************************************************/
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "gif_lib.h"
 
 #define MAX(x, y)	(((x) > (y)) ? (x) : (y))
--- imaptool-0.9.orig/debian/dirs
+++ imaptool-0.9/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
--- imaptool-0.9.orig/debian/control
+++ imaptool-0.9/debian/control
@@ -0,0 +1,13 @@
+Source: imaptool
+Section: web
+Priority: optional
+Maintainer: Colin Watson <cjwatson@debian.org>
+Build-Depends: debhelper (>= 4), x11proto-core-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev, libjpeg62-dev, libxaw7-dev
+Standards-Version: 3.7.2
+
+Package: imaptool
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A tool for creating client-side image maps
+ A simple (yet useful and free) tool for creating client-side image maps,
+ supporting GIF and JPEG images.
--- imaptool-0.9.orig/debian/copyright
+++ imaptool-0.9/debian/copyright
@@ -0,0 +1,20 @@
+This package was debianized by Sudhakar Chandrasekharan
+<thaths@netscape.com> on Wed, 19 Jan 2000 18:10:50 -0800, and is now
+maintained by Colin Watson <cjwatson@debian.org>.
+
+It was downloaded from http://www.sspitzer.org/imaptool/index.html
+
+Upstream Authors: Seth Spitzer <sspitzer@netscape.com>,
+                  Teemu Maijala <uucee@sci.fi>
+
+Copyright:
+
+Copyright (C) 2000 Seth Spitzer - sspitzer@sspitzer.org
+Copyright (C) 1996-1998 Teemu Maijala - uucee@sci.fi
+
+imaptool is released under the GNU General Public License (GPL) as free
+open source software. It is provided "as is" without express or implied
+warranty.
+
+On Debian GNU/Linux systems, the complete text of the GNU Library General
+Public License (GPL) can be found in /usr/share/common-licenses/GPL-2
--- imaptool-0.9.orig/debian/changelog
+++ imaptool-0.9/debian/changelog
@@ -0,0 +1,84 @@
+imaptool (0.9-8) unstable; urgency=low
+
+  * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
+  * Build-depend on x11proto-core-dev rather than x-dev (thanks, Lintian;
+    closes: #515374).
+  * Add actual copyright statements to copyright file, and explicitly refer
+    to GPL-2.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 15 Feb 2009 20:13:08 +0000
+
+imaptool (0.9-7) unstable; urgency=low
+
+  * Disable stripping of binaries from the Makefile; let dh_strip decide
+    whether to do it (closes: #437202).
+  * Use debhelper v4 and debian/compat.
+  * Policy version 3.7.2: no changes required.
+  * Don't ignore errors from 'make clean'. Use 'rm -f' in 'make clean'.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 12 Nov 2007 10:49:24 +0000
+
+imaptool (0.9-6) unstable; urgency=low
+
+  * Build-depend on x-dev, libx11-dev, libxext-dev, libxmu-dev, and
+    libxt-dev rather than the transitional xlibs-dev package.
+  * Policy version 3.6.1: no changes required.
+  * Correct imaptool(1)'s .TH line to read 1, not 1x (thanks, lintian).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 26 Nov 2004 14:12:20 +0000
+
+imaptool (0.9-5) unstable; urgency=low
+
+  * Install man page as imaptool.1, not imaptool.1x.
+  * Build with debugging symbols and warnings, plus optimizations if
+    $DEB_BUILD_OPTIONS does not contain 'noopt'.
+  * Add some missing prototypes exposed by -Wall. These will have caused
+    problems on machines where sizeof(int) != sizeof(void *).
+  * Remove Emacs local variables block from this changelog.
+  * If given a filename without any slashes, don't just say "unexpected
+    error" (when trying to strip off the directory to find the map name),
+    but do the right thing instead.
+  * Policy version 3.5.8.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 25 Jan 2003 02:26:33 +0000
+
+imaptool (0.9-4) unstable; urgency=low
+
+  * New maintainer (closes: #107425).
+  * Use debhelper 2, and clean up debian/rules.
+  * /usr/X11R6/bin -> /usr/bin, /usr/X11R6/man -> /usr/share/man.
+  * Minor additions to package description.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 17 Oct 2001 23:32:48 +0100
+
+imaptool (0.9-3) unstable; urgency=low
+
+  * Add build-dependency on libxaw7-dev (closes: #111080, #111147).
+
+ -- Colin Watson <cjwatson@debian.org>  Sat,  8 Sep 2001 03:02:55 +0100
+
+imaptool (0.9-2) unstable; urgency=low
+
+  * Maintainer set to Debian QA Group <packages@qa.debian.org>.
+  * Added build dependencies.
+  * Standards-Version: 3.5.6
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 31 Aug 2001 20:28:00 +0200
+
+imaptool (0.9-1) unstable; urgency=low
+
+  * New upstream author.  New version.
+
+ -- Sudhakar Chandrasekharan <thaths@netscape.com>  Wed, 19 Jan 2000 18:24:29 -0800
+
+imaptool (0.6.1-1) unstable; urgency=low
+
+  * Changed Depends to libjpeg62 from libjpeg6a
+
+ -- Sudhakar Chandrasekharan <thaths@netscape.com>  Mon, 27 Sep 1999 15:24:58 -0700
+
+imaptool (0.6-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Sudhakar Chandrasekharan <thaths@netscape.com>  Sun, 24 May 1998 13:37:29 -0700
--- imaptool-0.9.orig/debian/rules
+++ imaptool-0.9/debian/rules
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS := -O2 -g -Wall
+else
+CFLAGS := -g -Wall
+endif
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	$(MAKE) CFLAGS="$(CFLAGS)"
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	$(MAKE) clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=`pwd`/debian/imaptool INSTPGMFLAGS=
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs 
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- imaptool-0.9.orig/debian/compat
+++ imaptool-0.9/debian/compat
@@ -0,0 +1 @@
+4