Description:
 - Includes all changes made by original maintainer outside the debian/
   disrectory
Author: Ignace Mouzannar <mouzannar@gmail.com>
Last-Update: 2009-11-15

diff -urNad iptotal-0.3.3~/Makefile.am iptotal-0.3.3/Makefile.am
--- iptotal-0.3.3~/Makefile.am	2004-01-28 00:37:44.000000000 +0100
+++ iptotal-0.3.3/Makefile.am	2009-11-13 15:14:23.000000000 +0100
@@ -1,7 +1,7 @@
 PERL=@PERL@
 sbin_PROGRAMS = iptotal
 sbin_SCRIPTS = src/iptotald 
-data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif www/images/*.png www/archive/*.png 
+data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif
 sysconf_DATA = etc/iptotal.cfg
 iptotal_SOURCES = iptotal.c
 iptotal_LDADD = -lpcap
diff -urNad iptotal-0.3.3~/Makefile.in iptotal-0.3.3/Makefile.in
--- iptotal-0.3.3~/Makefile.in	2004-02-02 14:13:04.000000000 +0100
+++ iptotal-0.3.3/Makefile.in	2009-11-13 15:14:23.000000000 +0100
@@ -114,11 +114,11 @@
 target_alias = @target_alias@
 sbin_PROGRAMS = iptotal
 sbin_SCRIPTS = src/iptotald 
-data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif www/images/*.png www/archive/*.png 
+data_DATA = www/archive.cgi www/iptotal.cgi www/iptotal_w.cgi www/iptotal_m.cgi www/iptotal_y.cgi www/images/*.gif
 sysconf_DATA = etc/iptotal.cfg
 iptotal_SOURCES = iptotal.c
 iptotal_LDADD = -lpcap
-EXTRA_DIST = src/iptotald.in www/*.in www/images/*.png www/images/*.gif www/archive/*.png iptotal.1 iptotald.8 iptotal_config.5 etc/iptotal.cfg etc/iptotal.cfg.in
+EXTRA_DIST = src/iptotald.in www/*.in www/images/*.gif iptotal.1 iptotald.8 iptotal_config.5 etc/iptotal.cfg etc/iptotal.cfg.in
 SUBDIRS = etc www
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -435,7 +435,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/etc $(distdir)/src $(distdir)/www $(distdir)/www/archive $(distdir)/www/images
+	$(mkinstalldirs) $(distdir)/etc $(distdir)/src $(distdir)/www $(distdir)/www/images
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff -urNad iptotal-0.3.3~/iptotald.8 iptotal-0.3.3/iptotald.8
--- iptotal-0.3.3~/iptotald.8	2003-12-12 13:06:38.000000000 +0100
+++ iptotal-0.3.3/iptotald.8	2009-11-13 15:17:15.000000000 +0100
@@ -1,4 +1,4 @@
-.TH IPTOTALD 8 "Dec 2003" "iptotal 0.3.2" "System Manager's Manual"
+.TH IPTOTALD 8 "Jun 2004" "iptotal 0.3.3" "System Manager's Manual"
 .SH NAME
 iptotald \- iptotal daemon
 
@@ -9,7 +9,7 @@
 .B iptotald
 is the daemon program for iptotal. 
 
-iptotal is the daemon that regularly invokes iptotal(1) to monitor traffic.
+iptotal is the daemon that regularly invokes iptotal(8) to monitor traffic.
 It is normally started at boot from /etc/rc.
 
 .SH OPTIONS
@@ -19,8 +19,8 @@
 .SH CONFIGURATION FILE
 .TP
 /etc/iptotal.conf
-File that defines the configuration used to invoke iptotal(1). See 
-iptotald_config(5) for more details.
+File that defines the configuration used to invoke iptotal(8). See 
+iptotal_config(5) for more details.
 
 .SH AUTHOR
 Written by Antoine Megens <webmaster@dingetje.homeip.net>
@@ -30,7 +30,7 @@
 .SH "REPORTING BUGS"
 Report bugs to <webmaster@dingetje.homeip.net>
 .SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
+Copyright \(co 2003, 2004 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff -urNad iptotal-0.3.3~/www/Makefile.am iptotal-0.3.3/www/Makefile.am
--- iptotal-0.3.3~/www/Makefile.am	2004-01-27 23:25:34.000000000 +0100
+++ iptotal-0.3.3/www/Makefile.am	2009-11-13 15:14:23.000000000 +0100
@@ -1 +1 @@
-nobase_data_DATA = template.html images/*gif images/*png archive/*png archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi
+nobase_data_DATA = template.html images/*gif archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi
diff -urNad iptotal-0.3.3~/www/Makefile.in iptotal-0.3.3/www/Makefile.in
--- iptotal-0.3.3~/www/Makefile.in	2004-02-02 14:13:05.000000000 +0100
+++ iptotal-0.3.3/www/Makefile.in	2009-11-13 15:14:23.000000000 +0100
@@ -112,7 +112,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-nobase_data_DATA = template.html images/*gif images/*png archive/*png archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi
+nobase_data_DATA = template.html images/*gif archive.cgi iptotal.cgi iptotal_w.cgi iptotal_m.cgi iptotal_y.cgi
 subdir = www
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -urNad iptotal-0.3.3~/www/iptotal.cgi.in iptotal-0.3.3/www/iptotal.cgi.in
--- iptotal-0.3.3~/www/iptotal.cgi.in	2004-01-28 00:12:17.000000000 +0100
+++ iptotal-0.3.3/www/iptotal.cgi.in	2009-11-13 15:14:23.000000000 +0100
@@ -31,7 +31,7 @@
 
 </HEAD>
 <BODY bgColor=#000000 leftMargin=20 link=#00ff00 text=#ffff00 topMargin=20 
-vLink=#008000 background="/images/zertxtr.gif" bgproperties="fixed">
+vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">
 
 <H1>Network usage</H1>
 
@@ -57,7 +57,7 @@
           --lazy
           --end 'now-60s'
           --start 'end-2h'
-	  --imginfo '<IMG SRC=/images/%s ALT="kB/s">'
+	  --imginfo '<IMG SRC=/iptotal/images/%s ALT="kB/s">'
           DEF:in=@datadir@/iptotal.rrd:input:AVERAGE
           DEF:out=@datadir@/iptotal.rrd:output:AVERAGE
           AREA:in#009828:"In kByte/s"
@@ -73,7 +73,7 @@
           --height 150
           --end 'now-60s'
           --start 'end-24h'
-	  --imginfo '<IMG SRC=/images/%s ALT="kB/s">'
+	  --imginfo '<IMG SRC=/iptotal/images/%s ALT="kB/s">'
           DEF:in=@datadir@/iptotal.rrd:input:AVERAGE
           DEF:out=@datadir@/iptotal.rrd:output:AVERAGE
           DEF:maxin=@datadir@/iptotal.rrd:input:MAX
@@ -86,15 +86,15 @@
 </P>
 <HR>
 <a href="/">
-<img border="0" src="/images/home.gif" hspace="10" width="42" height="36"></a>
+<img border="0" src="/iptotal/images/home.gif" hspace="10" width="42" height="36"></a>
 <a href="iptotal_w.cgi">
-<img border=0 src="/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
+<img border=0 src="/iptotal/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
 <a href="iptotal_m.cgi">
-<img border=0 src="/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
+<img border=0 src="/iptotal/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
 <a href="iptotal_y.cgi">
-<img border=0 src="/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
+<img border=0 src="/iptotal/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
 <a href="archive.cgi">
-<img border=0 src="/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
+<img border=0 src="/iptotal/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
 
 </BODY>
 </HTML>
diff -urNad iptotal-0.3.3~/www/iptotal_m.cgi.in iptotal-0.3.3/www/iptotal_m.cgi.in
--- iptotal-0.3.3~/www/iptotal_m.cgi.in	2004-01-28 00:08:25.000000000 +0100
+++ iptotal-0.3.3/www/iptotal_m.cgi.in	2009-11-13 15:14:23.000000000 +0100
@@ -31,7 +31,7 @@
 
 </HEAD>
 <BODY bgColor=#000000 leftMargin=20 link=#00ff00 text=#ffff00 topMargin=20 
-vLink=#008000 background="/images/zertxtr.gif" bgproperties="fixed">
+vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">
 
 <H1>Network usage</H1>
 
@@ -57,7 +57,7 @@
           --lazy
           --end 'now-60s'
           --start 'end-744h'
-	  --imginfo '<IMG SRC=/images/%s ALT="kB/s">'
+	  --imginfo '<IMG SRC=/iptotal/images/%s ALT="kB/s">'
           DEF:in=@datadir@/iptotal.rrd:input:AVERAGE
           DEF:inmax=@datadir@/iptotal.rrd:input:MAX
           DEF:out=@datadir@/iptotal.rrd:output:AVERAGE
@@ -68,14 +68,14 @@
 </P>
 <HR>
 <a href="/">
-<img border="0" src="/images/home.gif" hspace="10" width="42" height="36"></a>
+<img border="0" src="/iptotal/images/home.gif" hspace="10" width="42" height="36"></a>
 <a href="iptotal.cgi">
-<img border=0 src="/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
+<img border=0 src="/iptotal/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
 <a href="iptotal_w.cgi">
-<img border=0 src="/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
+<img border=0 src="/iptotal/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
 <a href="iptotal_y.cgi">
-<img border=0 src="/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
+<img border=0 src="/iptotal/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
 <a href="archive.cgi">
-<img border=0 src="/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
+<img border=0 src="/iptotal/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
 </BODY>
 </HTML>
diff -urNad iptotal-0.3.3~/www/iptotal_w.cgi.in iptotal-0.3.3/www/iptotal_w.cgi.in
--- iptotal-0.3.3~/www/iptotal_w.cgi.in	2004-01-28 00:12:52.000000000 +0100
+++ iptotal-0.3.3/www/iptotal_w.cgi.in	2009-11-13 15:14:23.000000000 +0100
@@ -31,7 +31,7 @@
 
 </HEAD>
 <BODY bgColor=#000000 leftMargin=20 link=#00ff00 text=#ffff00 topMargin=20 
-vLink=#008000 background="/images/zertxtr.gif" bgproperties="fixed">
+vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">
 
 <H1>Network usage</H1>
 
@@ -57,7 +57,7 @@
           --height 150
           --end 'now-60s'
           --start 'end-168h'
-	  --imginfo '<IMG SRC=/images/%s ALT="kB/s">'
+	  --imginfo '<IMG SRC=/iptotal/images/%s ALT="kB/s">'
           DEF:inmax=@datadir@/iptotal.rrd:input:MAX
           DEF:outmax=@datadir@/iptotal.rrd:output:MAX
           DEF:inavg=@datadir@/iptotal.rrd:input:AVERAGE
@@ -68,14 +68,14 @@
 </P>
 <HR>
 <a href="/">
-<img border="0" src="/images/home.gif" hspace="10" width="42" height="36"></a>
+<img border="0" src="/iptotal/images/home.gif" hspace="10" width="42" height="36"></a>
 <a href="iptotal.cgi">
-<img border=0 src="/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
+<img border=0 src="/iptotal/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
 <a href="iptotal_m.cgi">
-<img border=0 src="/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
+<img border=0 src="/iptotal/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
 <a href="iptotal_y.cgi">
-<img border=0 src="/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
+<img border=0 src="/iptotal/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
 <a href="archive.cgi">
-<img border=0 src="/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
+<img border=0 src="/iptotal/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
 </BODY>
 </HTML>
diff -urNad iptotal-0.3.3~/www/iptotal_y.cgi.in iptotal-0.3.3/www/iptotal_y.cgi.in
--- iptotal-0.3.3~/www/iptotal_y.cgi.in	2004-01-28 00:09:44.000000000 +0100
+++ iptotal-0.3.3/www/iptotal_y.cgi.in	2009-11-13 15:14:23.000000000 +0100
@@ -31,7 +31,7 @@
 
 </HEAD>
 <BODY bgColor=#000000 leftMargin=20 link=#00ff00 text=#ffff00 topMargin=20 
-vLink=#008000 background="/images/zertxtr.gif" bgproperties="fixed">
+vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">
 
 <H1>Network usage</H1>
 
@@ -57,7 +57,7 @@
           --lazy
           --end 'now-60s'
           --start 'end-365d'
-	  --imginfo '<IMG SRC=/images/%s ALT="kB/s">'
+	  --imginfo '<IMG SRC=/iptotal/images/%s ALT="kB/s">'
           DEF:in=@datadir@/iptotal.rrd:input:AVERAGE
           DEF:out=@datadir@/iptotal.rrd:output:AVERAGE
           AREA:in#009828:"In kByte/s"
@@ -66,14 +66,14 @@
 </P>
 <HR>
 <a href="/">
-<img border="0" src="/images/home.gif" hspace="10" width="42" height="36"></a>
+<img border="0" src="/iptotal/images/home.gif" hspace="10" width="42" height="36"></a>
 <a href="iptotal.cgi">
-<img border=0 src="/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
+<img border=0 src="/iptotal/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
 <a href="iptotal_w.cgi">
-<img border=0 src="/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
+<img border=0 src="/iptotal/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
 <a href="iptotal_m.cgi">
-<img border=0 src="/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
+<img border=0 src="/iptotal/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
 <a href="archive.cgi">
-<img border=0 src="/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
+<img border=0 src="/iptotal/images/Archive_Button.gif" hspace=5 alt="Last 30 Days"></a>
 </BODY>
 </HTML>
diff -urNad iptotal-0.3.3~/www/template.html iptotal-0.3.3/www/template.html
--- iptotal-0.3.3~/www/template.html	1970-01-01 01:00:00.000000000 +0100
+++ iptotal-0.3.3/www/template.html	2009-11-13 15:14:23.000000000 +0100
@@ -0,0 +1,35 @@
+<html>
+<head>
+
+<!-- template for iptotal image archive page -->
+
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+
+<title><--TITLE--></title>
+
+</head>
+
+<BODY bgColor=#000000 leftMargin=2 link=#00ff00 text=#ffff00 topMargin=2 
+vLink=#008000 background="/iptotal/images/zertxtr.gif" bgproperties="fixed">
+
+<center><H1>iptotal daily graph images archive</H1></center>
+
+<p><--IMAGES--></p>
+
+<hr>
+<center>
+<a href="/">
+<img border="0" src="/iptotal/images/home.gif" hspace="10" width="42" height="36"></a>
+<a href="/cgi-bin/iptotal/iptotal.cgi">
+<img border=0 src="/iptotal/images/Daily_Button.gif" hspace=5 alt="Last 24 hr"></a>
+<a href="/cgi-bin/iptotal/iptotal_w.cgi">
+<img border=0 src="/iptotal/images/Week_Button.gif" hspace=5 alt="Last Week"></a>
+<a href="/cgi-bin/iptotal/iptotal_m.cgi">
+<img border=0 src="/iptotal/images/Month_Button.gif" hspace=5 alt="Last Month"></a>
+<a href="/cgi-bin/iptotal/iptotal_y.cgi">
+<img border=0 src="/iptotal/images/Year_Button.gif" hspace=5 alt="Last Year"></a>
+</center>
+</body>
+</html>
+
