[Forensics-changes] [chaosreader] 01/01: Imported Debian patch 0.94-8

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Thu Oct 27 11:51:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository chaosreader.

commit 3ddc5300eabaa0c275cb65142051e590c2558c6a
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Mon Oct 24 21:22:07 2016 -0200

    Imported Debian patch 0.94-8
---
 chaosreader0.94                                    |   3 +-
 debian/changelog                                   |  29 +++
 debian/compat                                      |   2 +-
 debian/control                                     |  11 +-
 debian/copyright                                   |  22 +-
 debian/gbp.conf                                    |   3 -
 debian/man/chaosreader.header                      |   1 -
 debian/man/chaosreader.txt                         | 201 ------------------
 debian/man/genallman.sh                            |  27 ---
 debian/{man => manpage}/chaosreader.1              | 235 ++++++++++-----------
 debian/manpage/chaosreader.txt                     | 216 +++++++++++++++++++
 debian/manpage/create-man.sh                       |  13 ++
 debian/manpages                                    |   2 +-
 ...01-fix-division.patch => 10_fix-division.patch} |   4 +-
 ...02-fix-old-perl.patch => 20_fix-old-perl.patch} |   4 +-
 debian/patches/series                              |   4 +-
 debian/rules                                       |   5 +-
 debian/watch                                       |   2 +-
 18 files changed, 406 insertions(+), 378 deletions(-)

diff --git a/chaosreader0.94 b/chaosreader0.94
index 7bbb41a..0f19145 100644
--- a/chaosreader0.94
+++ b/chaosreader0.94
@@ -262,7 +262,7 @@ $| = 1;					# flush output
 #  The following is needed for old perl5 multiline matching. New perl5 uses
 #  a "/s" on the RE (which is used in this program as well).
 #
-#$* = 1;					# old perl5
+$* = 1;					# old perl5
 
 #
 #  These ports have been selected to be saved as coloured 2-way HTML files
@@ -4028,7 +4028,6 @@ END
 	   ### This causes the replay program to pause
 	   print REPLAY "ms($timediff1);\n";
 	}
-	$duration = 0.01 if $duration == 0;     # avoid divide by 0,
 	$speed = sprintf("%.2f",$bytes / (1024 * $duration));
 	print REPLAY "print \"\n\n" .
 	 "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";";
diff --git a/debian/changelog b/debian/changelog
index d726e26..80a8bfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+chaosreader (0.94-8) unstable; urgency=medium
+
+  * Bumped DH level to 10.
+  * debian/control:
+      - Bumped Standards-Version to 3.9.8.
+      - Improved the long description.
+      - Updated the Vcs-* fields to use https instead of http and git.
+  * debian/copyright:
+      - Updated the GPL-2+ text.
+      - Updated the packaging copyright data.
+  * debian/gbp.conf: no longer used by me... Removed.
+  * debian/man/:
+      - Renamed to debian/manpage/.
+      - Changed from genallman.sh to create-man.sh.
+      - Updated the manpage. (Closes: #824434)
+  * debian/patches/:
+      - 01-fix-division.patch:
+          ~ Renamed to 10_fix-division.patch.
+          ~ Added the Last-Update field.
+      - 02-fix-old-perl.patch:
+          ~ Renamed to 20_fix-old-perl.patch.
+          ~ Added the Last-Update field.
+  * debian/rules:
+      - Added the override_dh_installchangelogs target.
+      - Removed the --parallel option from dh.
+  * debian/watch: bumped to version 4.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Mon, 24 Oct 2016 21:22:07 -0200
+
 chaosreader (0.94-7) unstable; urgency=medium
 
   * Bumped Standards-Version to 3.9.6.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 4163407..26d579e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: net
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
 Homepage: http://chaosreader.sf.net
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/chaosreader.git
-Vcs-Git: git://anonscm.debian.org/forensics/chaosreader.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/chaosreader.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/chaosreader.git
 
 Package: chaosreader
 Architecture: all
@@ -24,3 +24,6 @@ Description: trace network sessions and export it to html format
  .
  Chaosreader can also run in standalone mode, where it invokes tcpdump to
  create the log files and then processes them.
+ .
+ This package is useful for forensics investigations and for network traffic
+ analysis.
diff --git a/debian/copyright b/debian/copyright
index 2d80a9e..1156cf8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,23 +7,23 @@ Copyright: 2003-2004 Brendan Gregg <brendan at joyent.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2008-2014 Joao Eriberto Mota Filho <eriberto at debian.org>
+Copyright: 2009      Daniel Baumann <daniel at debian.org>
+           2009-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
 License: GPL-2+
- This program 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 2
- of the License, or (at your option) any later version.
+ This package 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 2 of the License, or
+ (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
+ This package 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
+ 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 23e88fe..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-debian-branch = debian
-pristine-tar = True
diff --git a/debian/man/chaosreader.header b/debian/man/chaosreader.header
deleted file mode 100644
index e4281b0..0000000
--- a/debian/man/chaosreader.header
+++ /dev/null
@@ -1 +0,0 @@
-.TH CHAOSREADER "1"  "Dec 2013" "CHAOSREADER 0.94" "trace network sessions and export it to html format"
diff --git a/debian/man/chaosreader.txt b/debian/man/chaosreader.txt
deleted file mode 100644
index 37f33a7..0000000
--- a/debian/man/chaosreader.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-NAME
-  chaosreader - trace network sessions and export it to html format
-SYNOPSIS
-  chaosreader
-
-  chaosreader [-aehikqrvxAHIRTUXY] [-D dir]
-              [-b port[,...]] [-B port[,...]]
-              [-j IPaddr[,...]] [-J IPaddr[,...]]
-              [-l port[,...]] [-L port[,...]] [-m bytes[k]]
-              [-M bytes[k]] [-o "time"|"size"|"type"|"ip"]
-              [-p port[,...]] [-P port[,...]]
-              infile [infile2 ...]
-
-  chaosreader -s [mins] | -S [mins[,count]]
-              [-z] [-f 'filter']
-DESCRIPTION
-  Chaosreader traces TCP/UDP/others sessions and fetches application data from
-  snoop or tcpdump logs. This is a type of "any-snarf" program, as it will
-  fetch telnet sessions, FTP files, HTTP transfers (HTML, GIF, JPEG etc) and
-  SMTP emails from the captured data inside network traffic logs. A html index
-  file is created to that links to all the session details, including realtime
-  replay programs for telnet, rlogin, IRC, X11 and VNC sessions. Chaosreader
-  reports such as image reports and HTTP GET/POST content reports.
-
-  Chaosreader can also run in standalone mode, where it invokes tcpdump to
-  create the log files and then processes them.
-OPTIONS
-    -a, --application      Create application session files (default)
-    -e, --everything       Create HTML 2-way & hex files for everything
-    -h                     Print a brief help
-    --help                 Print verbose help (this) and version
-    --help2                Print massive help
-    -i, --info             Create info file
-    -q, --quiet            Quiet, no output to screen
-    -r, --raw              Create raw files
-    -v, --verbose          Verbose - Create ALL files .. (except -e)
-    -x, --index            Create index files (default)
-    -A, --noapplication    Exclude application session files
-    -H, --hex              Include hex dumps (slow)
-    -I, --noinfo           Exclude info files
-    -R, --noraw            Exclude raw files
-    -T, --notcp            Exclude TCP traffic
-    -U, --noudp            Exclude UDP traffic
-    -Y, --noicmp           Exclude ICMP traffic
-    -X, --noindex          Exclude index files
-    -k, --keydata          Create extra files for keystroke analysis
-    -D dir, --dir dir         Output all files to this directory
-    -b 25,79, --playtcp 25,79   replay these TCP ports as well (playback)
-    -B 36,42, --playudp 36,42   replay these UDP ports as well (playback)
-    -l 7,79, --htmltcp 7,79    Create HTML for these TCP ports as well
-    -L 7,123, --htmludp 7,123   Create HTML for these UDP ports as well
-    -m 1k, --min 1k          Min size of connection to save ("k" for Kb)
-    -M 1024k, --max 1k          Max size of connection to save ("k" for Kb)
-    -o size, --sort size       sort Order: time/size/type/ip (Default time)
-    -p 21,23, --port 21,23      Only examine these ports (TCP & UDP)
-    -P 80,81, --noport 80,81    Exclude these ports (TCP & UDP)
-    -s 5, --runonce 5       Standalone. Run tcpdump/snoop for 5 mins.
-    -S 5,10, --runmany 5,10    Standalone, many. 10 samples of 5 mins each.
-    -S 5, --runmany 5       Standalone, endless. 5 min samples forever.
-    -z, --runredo         Standalone, redo. Rereads last run's logs.
-    -j 10.1.2.1, --ipaddr 10.1.2.1     Only examine these IPs
-    -J 10.1.2.1, --noipaddr 10.1.2.1   Exclude these IPs
-    -f 'port 7', --filter 'port 7'     With standalone, use this dump filter.
-OUTPUT FILES
-   index.html                  Html index (full details)
-   index.text                  Text index 
-   index.file                  File index for standalone redo mode
-   image.html                  HTML report of images
-   getpost.html                HTML report of HTTP GET/POST requests
-   session_0001.info           Info file describing TCP session #1
-   session_0001.telnet.html    HTML coloured 2-way capture (time sorted)
-   session_0001.telnet.raw     Raw data 2-way capture (time sorted)
-   session_0001.telnet.raw1    Raw 1-way capture (assembeled) server->client
-   session_0001.telnet.raw2    Raw 1-way capture (assembeled) client->server
-   session_0002.web.html       HTML coloured 2-way
-   session_0002.part_01.html   HTTP portion of the above, a HTML file
-   session_0003.web.html       HTML coloured 2-way
-   session_0003.part_01.jpeg   HTTP portion of the above, a JPEG file
-   session_0004.web.html       HTML coloured 2-way
-   session_0004.part_01.gif    HTTP portion of the above, a GIF file
-   session_0005.part_01.ftp-data.gz    An FTP transfer, a gz file.
-CONVENTIONS
-   session_*           TCP Sessions
-   stream_*            UDP Streams
-   icmp_*              ICMP packets
-   index.html          HTML Index 
-   index.text          Text Index
-   index.file          File Index for standalone redo mode only
-   image.html          HTML report of images
-   getpost.html        HTML report of HTTP GET/POST requests
-   *.info              Info file describing the Session/Stream
-   *.raw               Raw data 2-way capture (time sorted)
-   *.raw1              Raw 1-way capture (assembeled) server->client
-   *.raw2              Raw 1-way capture (assembeled) client->server
-   *.replay            Session replay program (perl)
-   *.partial.*         Partial capture (tcpdump/snoop were aware of drops)
-   *.hex.html          2-way Hex dump, rendered in coloured HTML
-   *.hex.text          2-way Hex dump in plain text
-   *.X11.replay        X11 replay script (talks X11)
-   *.textX11.replay    X11 communicated text replay script (text only)
-   *.textX11.html      2-way text report, rendered in red/blue HTML
-   *.keydata           Keystroke delay data file. Used for SSH analysis.
-MODES
-  Normal   eg "chaosreader infile", this is where a tcpdump/snoop file
-    was created previously and chaosreader reads and processes it.
-  Standalone once   eg "chaosreader -s 10" this is where chaosreader
-    runs tcpdump/snoop and generates the log file, in this case for 10 i
-    minutes, and then processes the result. Some OS's may not have 
-    tcpdump or snoop available so this will not work (instead you may be 
-    able to get Ethereal, run it, save to a file, then use normal mode).
-    There is a master index.html and the report index.html in a sub dir,
-    which is of the format out_YYYYMMDD-hhmm, eg "out_20031003-2221".
-  Standalone, many   eg "chaosreader -S 5,12", this is where chaosreader
-    runs tcpdump/snoop and generates many log files, in this case it 
-    samples 12 times for 5 minutes each. While this is running, the master
-    index.html can be viewed to watch progress, which links to minor 
-    index.html reports in each sub directory.
-  Standalone, redo   eg "chaosreader -ve -z", (the -z), this is where
-    a standalone capture was previously performed - and now you would like
-    to reprocess the logs - perhaps with different options (in this case,
-    "-ve"). It reads index.file to determine which capture logs to read.
-  Standalone, endless   eg "chaosreader -S 5", like standalone many - 
-    but runs forever (if you ever had the need?). Watch your disk space!
-
-  Note: this is a work in progress, some of the code is a little unpolished.
-ADVICES
-  * Run chaosreader in an empty directory.
-  * Create small packet dumps. Chaosreader uses around 5x the dump size 
-    in memory. A 100Mb file could need 500Mb of RAM to process. 
-  * Your tcpdump may allow "-s0" (entire packet) instead of "-s9000".
-  * Beware of using too much disk space, especially standalone mode.
-  * If you capture too many small connections giving a huge index.html,
-    try using the -m option to ignore small connections. eg "-m 1k".
-  * snoop logs may actually work better. Snoop logs are based on RFC1761, 
-    however there are many varients of tcpdump/libpcap and this program
-    cannot read them all. If you have Ethereal you can create snoop logs
-    during the "save as" option. On Solaris use "snoop -o logfile".
-  * tcpdump logs may not be portable between OSs that use different sized
-    timestamps or endian.
-  * Logs are best created in a memory filesystem for speed, usually /tmp.
-  * For X11 or VNC playbacks, first practise by replaying a recent captured 
-    session of your own. The biggest problem is colour depth, your screen
-    must match the capture. For X11 check authentication (xhost +), for
-    VNC check the viewers options (-8bit, "Hextile", ...)
-  * SSH analysis can be performed with the "sshkeydata" program as
-    demonstrated on http://www.brendangregg.com/sshanalysis.html . 
-    chaosreader provides the input files (*.keydata) that sshkeydata 
-    analyses.
-BUGS
-   * The following assumptions may cause problems (check for new vers);
-   * A lower port number = the service type. Eg with ports 31247 and 23,
-     the actual type of session is telnet (23). This may not work for
-     some things (eg, VNC).
-   * Time based order is more important for 2-way sessions (eg telnet), 
-     SEQ order is more import for 1-way transfers (eg ftp-data).
-   * One particular TCP session isn't active for long enough that the SEQ
-     number loops (or even wraps).
-EXAMPLES
-  * Example 1:
-
-      tcpdump \-s9000 \-w out1; chaosreader out1; netscape index.html
-
-        or,
-
-      snoop -o out1; chaosreader out1; netscape index.html
-
-        or,
-
-      ethereal (save as "out1"); chaosreader out1; netscape index.html
-
-        or,
-
-      chaosreader -s 5; netscape index.html
-
-  * Example 2:
-
-      tcpdump \-s9000 \-w output1        # create tcpdump capture file
-
-      chaosreader output1              # extract recognised sessions, or,
-
-      chaosreader \-ve output1          # gimme everything, or,
-
-      chaosreader \-p 20,21,23 output1  # only ftp and telnet...
-
-  * Example 3:
-
-      snoop \-o output1                 # create snoop capture file instead
-
-      chaosreader output1              # extract recognised sessions...
-
-  * Example 4:
-
-      chaosreader \-S 2,5      # Standalone, sniff network 5 times for 2 mins
-                              # each. View index.html for progress (or .text)
-SEE ALSO
-  tcpdump(8), chaosreader help page.
-AUTHORS
-  chaosreader was written by Brendan Gregg.
-
-  This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org> for the Debian project (but may be used by others). The base of this text was caught off chaosreader source code.
-
diff --git a/debian/man/genallman.sh b/debian/man/genallman.sh
deleted file mode 100755
index 130ecf8..0000000
--- a/debian/man/genallman.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Generate several manpages at the same time.
-# C 2014 Joao Eriberto Mota Filho <eriberto at debian.org>
-#
-# You can use this code in the same terms of the BSD-3-clause license or,
-# optionally, in the same terms of the license used in debian/ directory
-# in this Debian package. Please, to the last option, refer the package
-# name when using.
-#
-# This script uses txt2man. You need 2 files: program_name.txt and
-# program_name.header.
-#
-# The program_name.header must be use this structure:
-#
-# .TH <program_name> "<manpage_level>"  "<date>" "<program_name_upper_case> <program_version>" "<program_description>"
-#
-# Example:
-#
-# .TH mac-robber "1"  "May 2013" "MAC-ROBBER 1.02" "collects data about allocated files in mounted filesystems"
-
-for NAME in $(ls | grep header | cut -d'.' -f1)
-do
-    LEVEL=$(cat $NAME.header | cut -d" " -f3 | tr -d '"')
-    cat $NAME.header > $NAME.$LEVEL
-    txt2man $NAME.txt | grep -v '^.TH ' >> $NAME.$LEVEL
-done
diff --git a/debian/man/chaosreader.1 b/debian/manpage/chaosreader.1
similarity index 59%
rename from debian/man/chaosreader.1
rename to debian/manpage/chaosreader.1
index bf9e86f..c1da325 100644
--- a/debian/man/chaosreader.1
+++ b/debian/manpage/chaosreader.1
@@ -1,7 +1,8 @@
-.TH CHAOSREADER "1"  "Dec 2013" "CHAOSREADER 0.94" "trace network sessions and export it to html format"
-.\"Text automatically generated by txt2man
+.\" Text automatically generated by txt2man
+.TH chaosreader 1 "27 Dec 2013" "chaosreader-0.94" "trace network sessions and export it to html format"
 .SH NAME
 \fBchaosreader \fP- trace network sessions and export it to html format
+\fB
 .SH SYNOPSIS
 .nf
 .fam C
@@ -17,6 +18,7 @@
 
 \fBchaosreader\fP \fB-s\fP [\fImins\fP] | \fB-S\fP [\fImins\fP[,count]]
             [\fB-z\fP] [\fB-f\fP 'filter']
+
 .fam T
 .fi
 .fam T
@@ -36,103 +38,103 @@ create the log files and then processes them.
 .TP
 .B
 \fB-a\fP, \fB--application\fP
-Create application session files (default)
+Create application session files (default).
 .TP
 .B
 \fB-e\fP, \fB--everything\fP
-Create HTML 2-way & hex files for everything
+Create HTML 2-way & hex files for everything.
 .TP
 .B
 \fB-h\fP
-Print a brief help
+Print a brief help.
 .TP
 .B
 \fB--help\fP
-Print verbose help (this) and version
+Print verbose help (this) and version.
 .TP
 .B
 \fB--help2\fP
-Print massive help
+Print massive help.
 .TP
 .B
 \fB-i\fP, \fB--info\fP
-Create info file
+Create info file.
 .TP
 .B
 \fB-q\fP, \fB--quiet\fP
-Quiet, no output to screen
+Quiet, no output to screen.
 .TP
 .B
 \fB-r\fP, \fB--raw\fP
-Create raw files
+Create raw files.
 .TP
 .B
 \fB-v\fP, \fB--verbose\fP
-Verbose - Create ALL files .. (except \fB-e\fP)
+Verbose.
 .TP
 .B
 \fB-x\fP, \fB--index\fP
-Create index files (default)
+Create index files (default).
 .TP
 .B
 \fB-A\fP, \fB--noapplication\fP
-Exclude application session files
+Exclude application session files.
 .TP
 .B
 \fB-H\fP, \fB--hex\fP
-Include hex dumps (slow)
+Include hex dumps (slow).
 .TP
 .B
 \fB-I\fP, \fB--noinfo\fP
-Exclude info files
+Exclude info files.
 .TP
 .B
 \fB-R\fP, \fB--noraw\fP
-Exclude raw files
+Exclude raw files.
 .TP
 .B
 \fB-T\fP, \fB--notcp\fP
-Exclude TCP traffic
+Exclude TCP traffic.
 .TP
 .B
 \fB-U\fP, \fB--noudp\fP
-Exclude UDP traffic
+Exclude UDP traffic.
 .TP
 .B
 \fB-Y\fP, \fB--noicmp\fP
-Exclude ICMP traffic
+Exclude ICMP traffic.
 .TP
 .B
 \fB-X\fP, \fB--noindex\fP
-Exclude index files
+Exclude index files.
 .TP
 .B
 \fB-k\fP, \fB--keydata\fP
-Create extra files for keystroke analysis
+Create extra files for keystroke analysis.
 .TP
 .B
 \fB-D\fP \fIdir\fP, --\fIdir\fP \fIdir\fP
-Output all files to this directory
+Output all files to this directory.
 .TP
 .B
 \fB-b\fP 25,79, \fB--playtcp\fP 25,79
-replay these TCP ports as well (playback)
+Replay these TCP ports as well (playback).
 .TP
 .B
 \fB-B\fP 36,42, \fB--playudp\fP 36,42
-replay these UDP ports as well (playback)
+Replay these UDP ports as well (playback).
 .TP
 .B
 \fB-l\fP 7,79, \fB--htmltcp\fP 7,79
-Create HTML for these TCP ports as well
+Create HTML for these TCP ports as well.
 .TP
 .B
 \fB-L\fP 7,123, \fB--htmludp\fP 7,123
-Create HTML for these UDP ports as well
+Create HTML for these UDP ports as well.
 .TP
 .B
 \fB-m\fP 1k, \fB--min\fP 1k
-Min size of connection to save ("k" for Kb)
+Min size of connection to save ("k" for Kb).
 .TP
 .B
 \fB-M\fP 1024k, \fB--max\fP 1k
@@ -140,15 +142,15 @@ Max size of connection to save ("k" for Kb)
 .TP
 .B
 \fB-o\fP size, \fB--sort\fP size
-sort Order: time/size/type/ip (Default time)
+Sort Order: time/size/type/ip (Default time).
 .TP
 .B
 \fB-p\fP 21,23, \fB--port\fP 21,23
-Only examine these ports (TCP & UDP)
+Only examine these ports (TCP & UDP).
 .TP
 .B
 \fB-P\fP 80,81, \fB--noport\fP 80,81
-Exclude these ports (TCP & UDP)
+Exclude these ports (TCP & UDP).
 .TP
 .B
 \fB-s\fP 5, \fB--runonce\fP 5
@@ -168,11 +170,11 @@ Standalone, redo. Rereads last run's logs.
 .TP
 .B
 \fB-j\fP 10.1.2.1, \fB--ipaddr\fP 10.1.2.1
-Only examine these IPs
+Only examine these IPs.
 .TP
 .B
 \fB-J\fP 10.1.2.1, \fB--noipaddr\fP 10.1.2.1
-Exclude these IPs
+Exclude these IPs.
 .TP
 .B
 \fB-f\fP 'port 7', \fB--filter\fP 'port 7'
@@ -181,67 +183,67 @@ With standalone, use this dump filter.
 .TP
 .B
 index.html
-Html index (full details)
+Html index (full details).
 .TP
 .B
 index.text
-Text index 
+Text index.
 .TP
 .B
 index.file
-File index for standalone redo mode
+File index for standalone redo mode.
 .TP
 .B
 image.html
-HTML report of images
+HTML report of images.
 .TP
 .B
 getpost.html
-HTML report of HTTP GET/POST requests
+HTML report of HTTP GET/POST requests.
 .TP
 .B
 session_0001.info
-Info file describing TCP session #1
+Info file describing TCP session #1.
 .TP
 .B
 session_0001.telnet.html
-HTML coloured 2-way capture (time sorted)
+HTML colored 2-way capture (time sorted).
 .TP
 .B
 session_0001.telnet.raw
-Raw data 2-way capture (time sorted)
+Raw data 2-way capture (time sorted).
 .TP
 .B
 session_0001.telnet.raw1
-Raw 1-way capture (assembeled) server->client
+Raw 1-way capture (assembled) server->client.
 .TP
 .B
 session_0001.telnet.raw2
-Raw 1-way capture (assembeled) client->server
+Raw 1-way capture (assembled) client->server.
 .TP
 .B
 session_0002.web.html
-HTML coloured 2-way
+HTML colored 2-way.
 .TP
 .B
 session_0002.part_01.html
-HTTP portion of the above, a HTML file
+HTTP portion of the above, a HTML file.
 .TP
 .B
 session_0003.web.html
-HTML coloured 2-way
+HTML colored 2-way.
 .TP
 .B
 session_0003.part_01.jpeg
-HTTP portion of the above, a JPEG file
+HTTP portion of the above, a JPEG file.
 .TP
 .B
 session_0004.web.html
-HTML coloured 2-way
+HTML colored 2-way.
 .TP
 .B
 session_0004.part_01.gif
-HTTP portion of the above, a GIF file
+HTTP portion of the above, a GIF file.
 .TP
 .B
 session_0005.part_01.ftp-data.gz
@@ -250,79 +252,79 @@ An FTP transfer, a gz file.
 .TP
 .B
 session_*
-TCP Sessions
+TCP Sessions.
 .TP
 .B
 stream_*
-UDP Streams
+UDP Streams.
 .TP
 .B
 icmp_*
-ICMP packets
+ICMP packets.
 .TP
 .B
 index.html
-HTML Index 
+HTML Index.
 .TP
 .B
 index.text
-Text Index
+Text Index.
 .TP
 .B
 index.file
-File Index for standalone redo mode only
+File Index for standalone redo mode only.
 .TP
 .B
 image.html
-HTML report of images
+HTML report of images.
 .TP
 .B
 getpost.html
-HTML report of HTTP GET/POST requests
+HTML report of HTTP GET/POST requests.
 .TP
 .B
 *.info
-Info file describing the Session/Stream
+Info file describing the Session/Stream.
 .TP
 .B
 *.raw
-Raw data 2-way capture (time sorted)
+Raw data 2-way capture (time sorted).
 .TP
 .B
 *.raw1
-Raw 1-way capture (assembeled) server->client
+Raw 1-way capture (assembled) server->client.
 .TP
 .B
 *.raw2
-Raw 1-way capture (assembeled) client->server
+Raw 1-way capture (assembled) client->server.
 .TP
 .B
 *.replay
-Session replay program (perl)
+Session replay program (perl).
 .TP
 .B
 *.partial.*
-Partial capture (tcpdump/snoop were aware of drops)
+Partial capture (tcpdump/snoop were aware of drops).
 .TP
 .B
 *.hex.html
-2-way Hex dump, rendered in coloured HTML
+2-way Hex dump, rendered in colored HTML.
 .TP
 .B
 *.hex.text
-2-way Hex dump in plain text
+2-way Hex dump in plain text.
 .TP
 .B
 *.X11.replay
-X11 replay script (talks X11)
+X11 replay script (talks X11).
 .TP
 .B
 *.textX11.replay
-X11 communicated text replay script (text only)
+X11 communicated text replay script (text only).
 .TP
 .B
 *.textX11.html
-2-way text report, rendered in red/blue HTML
+2-way text report, rendered in red/blue HTML.
 .TP
 .B
 *.keydata
@@ -337,40 +339,45 @@ was created previously and \fBchaosreader\fP reads and processes it.
 .B
 Standalone once
 eg "\fBchaosreader\fP \fB-s\fP 10" this is where \fBchaosreader\fP
-runs tcpdump/snoop and generates the log file, in this case for 10 i
-minutes, and then processes the result. Some OS's may not have 
-tcpdump or snoop available so this will not work (instead you may be 
-able to get Ethereal, run it, save to a file, then use normal mode).
-There is a master index.html and the report index.html in a sub \fIdir\fP,
-which is of the format out_YYYYMMDD-hhmm, eg "out_20031003-2221".
+runs tcpdump/snoop and generates the log file, in
+this case for 10 minutes, and then processes the result.
+Some OS's may not have tcpdump or snoop available so
+this will not work (instead you may be able to get
+Ethereal, run it, save to a file, then use normal mode).
+There is a master index.html and the report index.html
+in a sub \fIdir\fP, which is of the format out_YYYYMMDD-hhmm,
+eg "out_20031003-2221".
 .TP
 .B
 Standalone, many
 eg "\fBchaosreader\fP \fB-S\fP 5,12", this is where \fBchaosreader\fP
-runs tcpdump/snoop and generates many log files, in this case it 
-samples 12 times for 5 minutes each. While this is running, the master
-index.html can be viewed to watch progress, which links to minor 
-index.html reports in each sub directory.
+runs tcpdump/snoop and generates many log files, in
+this case it samples 12 times for 5 minutes each.
+While this is running, the master index.html can be
+viewed to watch progress, which links to minor index.html
+reports in each sub directory.
 .TP
 .B
 Standalone, redo
-eg "\fBchaosreader\fP \fB-ve\fP \fB-z\fP", (the \fB-z\fP), this is where
-a standalone capture was previously performed - and now you would like
-to reprocess the logs - perhaps with different options (in this case,
-"\fB-ve\fP"). It reads index.file to determine which capture logs to read.
+eg "\fBchaosreader\fP \fB-ve\fP \fB-z\fP", (the \fB-z\fP), this is where a
+standalone capture was previously performed - and now you
+would like to reprocess the logs - perhaps with different
+options (in this case, "\fB-ve\fP"). It reads index.file to
+determine which capture logs to read.
 .TP
 .B
 Standalone, endless
-eg "\fBchaosreader\fP \fB-S\fP 5", like standalone many - 
-but runs forever (if you ever had the need?). Watch your disk space!
+eg "\fBchaosreader\fP \fB-S\fP 5", like standalone many - but runs
+forever (if you ever had the need?). Watch your disk
+space!
 .PP
 Note: this is a work in progress, some of the code is a little unpolished.
-.SH ADVICES
+.SH ADVICE
 .IP \(bu 3
 Run \fBchaosreader\fP in an empty directory.
 .IP \(bu 3
 Create small packet dumps. Chaosreader uses around 5x the dump size
-in memory. A 100Mb file could need 500Mb of RAM to process. 
+in memory. A 100Mb file could need 500Mb of RAM to process.
 .IP \(bu 3
 Your tcpdump may allow "\fB-s0\fP" (entire packet) instead of "\fB-s9000\fP".
 .IP \(bu 3
@@ -380,7 +387,7 @@ If you capture too many small connections giving a huge index.html,
 try using the \fB-m\fP option to ignore small connections. eg "\fB-m\fP 1k".
 .IP \(bu 3
 snoop logs may actually work better. Snoop logs are based on RFC1761,
-however there are many varients of tcpdump/libpcap and this program
+however there are many variants of tcpdump/libpcap and this program
 cannot read them all. If you have Ethereal you can create snoop logs
 during the "save as" option. On Solaris use "snoop \fB-o\fP logfile".
 .IP \(bu 3
@@ -390,13 +397,13 @@ timestamps or endian.
 Logs are best created in a memory filesystem for speed, usually /tmp.
 .IP \(bu 3
 For X11 or VNC playbacks, first practise by replaying a recent captured
-session of your own. The biggest problem is colour depth, your screen
+session of your own. The biggest problem is color depth, your screen
 must match the capture. For X11 check authentication (xhost +), for
 VNC check the viewers options (\fB-8bit\fP, "Hextile", \.\.\.)
 .IP \(bu 3
 SSH analysis can be performed with the "sshkeydata" program as
-demonstrated on http://www.brendangregg.com/sshanalysis.html . 
-\fBchaosreader\fP provides the input files (*.keydata) that sshkeydata 
+demonstrated on http://www.brendangregg.com/sshanalysis.html .
+\fBchaosreader\fP provides the input files (*.keydata) that sshkeydata
 analyses.
 .SH BUGS
 .IP \(bu 3
@@ -417,45 +424,34 @@ Example 1:
 .PP
 .nf
 .fam C
-      tcpdump \-s9000 \-w out1; chaosreader out1; netscape index.html
+    tcpdump \-s9000 \-w out1; chaosreader out1; netscape index.html
 
-.nf
-.fam C
-        or,
+    or,
 
-.fam T
-.fi
-.RS
-snoop \fB-o\fP out1; \fBchaosreader\fP out1; netscape index.html
-.PP
-.nf
-.fam C
-        or,
+    snoop -o out1; chaosreader out1; netscape index.html
 
-.fam T
-.fi
-ethereal (save as "out1"); \fBchaosreader\fP out1; netscape index.html
-.PP
-.nf
-.fam C
-        or,
+    or,
+
+    ethereal (save as "out1"); chaosreader out1; netscape index.html
+
+    or,
+
+    chaosreader -s 5; netscape index.html
 
 .fam T
 .fi
-\fBchaosreader\fP \fB-s\fP 5; netscape index.html
-.RE
 .IP \(bu 3
 Example 2:
 .PP
 .nf
 .fam C
-      tcpdump \-s9000 \-w output1        # create tcpdump capture file
+    tcpdump \-s9000 \-w output1        # create tcpdump capture file
 
-      chaosreader output1              # extract recognised sessions, or,
+    chaosreader output1              # extract recognised sessions, or,
 
-      chaosreader \-ve output1          # gimme everything, or,
+    chaosreader \-ve output1          # gimme everything, or,
 
-      chaosreader \-p 20,21,23 output1  # only ftp and telnet\.\.\.
+    chaosreader \-p 20,21,23 output1  # only ftp and telnet\.\.\.
 
 .fam T
 .fi
@@ -464,9 +460,9 @@ Example 3:
 .PP
 .nf
 .fam C
-      snoop \-o output1                 # create snoop capture file instead
+    snoop \-o output1                 # create snoop capture file instead
 
-      chaosreader output1              # extract recognised sessions\.\.\.
+    chaosreader output1              # extract recognised sessions\.\.\.
 
 .fam T
 .fi
@@ -475,8 +471,9 @@ Example 4:
 .PP
 .nf
 .fam C
-      chaosreader \-S 2,5      # Standalone, sniff network 5 times for 2 mins
-                              # each. View index.html for progress (or .text)
+    chaosreader \-S 2,5      # Standalone, sniff network 5 times for 2 mins
+                            each. View index.html for progress (or .text)
+
 .fam T
 .fi
 .SH SEE ALSO
@@ -484,4 +481,4 @@ Example 4:
 .SH AUTHORS
 \fBchaosreader\fP was written by Brendan Gregg.
 .PP
-This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org> for the Debian project (but may be used by others). The base of this text was caught off \fBchaosreader\fP source code.
+This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org> for the Debian project (but may be used by others).
diff --git a/debian/manpage/chaosreader.txt b/debian/manpage/chaosreader.txt
new file mode 100644
index 0000000..241d8d0
--- /dev/null
+++ b/debian/manpage/chaosreader.txt
@@ -0,0 +1,216 @@
+NAME
+  chaosreader - trace network sessions and export it to html format
+
+SYNOPSIS
+  chaosreader
+
+  chaosreader [-aehikqrvxAHIRTUXY] [-D dir]
+              [-b port[,...]] [-B port[,...]]
+              [-j IPaddr[,...]] [-J IPaddr[,...]]
+              [-l port[,...]] [-L port[,...]] [-m bytes[k]]
+              [-M bytes[k]] [-o "time"|"size"|"type"|"ip"]
+              [-p port[,...]] [-P port[,...]]
+              infile [infile2 ...]
+
+  chaosreader -s [mins] | -S [mins[,count]]
+              [-z] [-f 'filter']
+
+DESCRIPTION
+  Chaosreader traces TCP/UDP/others sessions and fetches application data from
+  snoop or tcpdump logs. This is a type of "any-snarf" program, as it will
+  fetch telnet sessions, FTP files, HTTP transfers (HTML, GIF, JPEG etc) and
+  SMTP emails from the captured data inside network traffic logs. A html index
+  file is created to that links to all the session details, including realtime
+  replay programs for telnet, rlogin, IRC, X11 and VNC sessions. Chaosreader
+  reports such as image reports and HTTP GET/POST content reports.
+
+  Chaosreader can also run in standalone mode, where it invokes tcpdump to
+  create the log files and then processes them.
+
+OPTIONS
+  -a, --application      Create application session files (default).
+  -e, --everything       Create HTML 2-way & hex files for everything.
+  -h                     Print a brief help.
+  --help                 Print verbose help (this) and version.
+  --help2                Print massive help.
+  -i, --info             Create info file.
+  -q, --quiet            Quiet, no output to screen.
+  -r, --raw              Create raw files.
+  -v, --verbose          Verbose.
+  -x, --index            Create index files (default).
+  -A, --noapplication    Exclude application session files.
+  -H, --hex              Include hex dumps (slow).
+  -I, --noinfo           Exclude info files.
+  -R, --noraw            Exclude raw files.
+  -T, --notcp            Exclude TCP traffic.
+  -U, --noudp            Exclude UDP traffic.
+  -Y, --noicmp           Exclude ICMP traffic.
+  -X, --noindex          Exclude index files.
+  -k, --keydata          Create extra files for keystroke analysis.
+  -D dir, --dir dir           Output all files to this directory.
+  -b 25,79, --playtcp 25,79   Replay these TCP ports as well (playback).
+  -B 36,42, --playudp 36,42   Replay these UDP ports as well (playback).
+  -l 7,79, --htmltcp 7,79     Create HTML for these TCP ports as well.
+  -L 7,123, --htmludp 7,123   Create HTML for these UDP ports as well.
+  -m 1k, --min 1k             Min size of connection to save ("k" for Kb).
+  -M 1024k, --max 1k          Max size of connection to save ("k" for Kb)
+  -o size, --sort size        Sort Order: time/size/type/ip (Default time).
+  -p 21,23, --port 21,23      Only examine these ports (TCP & UDP).
+  -P 80,81, --noport 80,81    Exclude these ports (TCP & UDP).
+  -s 5, --runonce 5           Standalone. Run tcpdump/snoop for 5 mins.
+  -S 5,10, --runmany 5,10     Standalone, many. 10 samples of 5 mins each.
+  -S 5, --runmany 5           Standalone, endless. 5 min samples forever.
+  -z, --runredo               Standalone, redo. Rereads last run's logs.
+  -j 10.1.2.1, --ipaddr 10.1.2.1     Only examine these IPs.
+  -J 10.1.2.1, --noipaddr 10.1.2.1   Exclude these IPs.
+  -f 'port 7', --filter 'port 7'     With standalone, use this dump filter.
+
+OUTPUT FILES
+  index.html                  Html index (full details).
+  index.text                  Text index.
+  index.file                  File index for standalone redo mode.
+  image.html                  HTML report of images.
+  getpost.html                HTML report of HTTP GET/POST requests.
+  session_0001.info           Info file describing TCP session #1.
+  session_0001.telnet.html    HTML colored 2-way capture (time sorted).
+  session_0001.telnet.raw     Raw data 2-way capture (time sorted).
+  session_0001.telnet.raw1    Raw 1-way capture (assembled) server->client.
+  session_0001.telnet.raw2    Raw 1-way capture (assembled) client->server.
+  session_0002.web.html       HTML colored 2-way.
+  session_0002.part_01.html   HTTP portion of the above, a HTML file.
+  session_0003.web.html       HTML colored 2-way.
+  session_0003.part_01.jpeg   HTTP portion of the above, a JPEG file.
+  session_0004.web.html       HTML colored 2-way.
+  session_0004.part_01.gif    HTTP portion of the above, a GIF file.
+  session_0005.part_01.ftp-data.gz    An FTP transfer, a gz file.
+
+CONVENTIONS
+  session_*           TCP Sessions.
+  stream_*            UDP Streams.
+  icmp_*              ICMP packets.
+  index.html          HTML Index.
+  index.text          Text Index.
+  index.file          File Index for standalone redo mode only.
+  image.html          HTML report of images.
+  getpost.html        HTML report of HTTP GET/POST requests.
+  *.info              Info file describing the Session/Stream.
+  *.raw               Raw data 2-way capture (time sorted).
+  *.raw1              Raw 1-way capture (assembled) server->client.
+  *.raw2              Raw 1-way capture (assembled) client->server.
+  *.replay            Session replay program (perl).
+  *.partial.*         Partial capture (tcpdump/snoop were aware of drops).
+  *.hex.html          2-way Hex dump, rendered in colored HTML.
+  *.hex.text          2-way Hex dump in plain text.
+  *.X11.replay        X11 replay script (talks X11).
+  *.textX11.replay    X11 communicated text replay script (text only).
+  *.textX11.html      2-way text report, rendered in red/blue HTML.
+  *.keydata           Keystroke delay data file. Used for SSH analysis.
+
+MODES
+  Normal  eg "chaosreader infile", this is where a tcpdump/snoop file
+          was created previously and chaosreader reads and processes it.
+  Standalone once  eg "chaosreader -s 10" this is where chaosreader
+                  runs tcpdump/snoop and generates the log file, in
+                  this case for 10 minutes, and then processes the result.
+                  Some OS's may not have tcpdump or snoop available so
+                  this will not work (instead you may be able to get
+                  Ethereal, run it, save to a file, then use normal mode).
+                  There is a master index.html and the report index.html
+                  in a sub dir, which is of the format out_YYYYMMDD-hhmm,
+                  eg "out_20031003-2221".
+  Standalone, many  eg "chaosreader -S 5,12", this is where chaosreader
+                    runs tcpdump/snoop and generates many log files, in
+                    this case it samples 12 times for 5 minutes each.
+                    While this is running, the master index.html can be
+                    viewed to watch progress, which links to minor index.html
+                    reports in each sub directory.
+  Standalone, redo  eg "chaosreader -ve -z", (the -z), this is where a
+                    standalone capture was previously performed - and now you
+                    would like to reprocess the logs - perhaps with different
+                    options (in this case, "-ve"). It reads index.file to
+                    determine which capture logs to read.
+  Standalone, endless  eg "chaosreader -S 5", like standalone many - but runs
+                       forever (if you ever had the need?). Watch your disk
+                       space!
+
+  Note: this is a work in progress, some of the code is a little unpolished.
+
+ADVICE
+  * Run chaosreader in an empty directory.
+  * Create small packet dumps. Chaosreader uses around 5x the dump size
+    in memory. A 100Mb file could need 500Mb of RAM to process.
+  * Your tcpdump may allow "-s0" (entire packet) instead of "-s9000".
+  * Beware of using too much disk space, especially standalone mode.
+  * If you capture too many small connections giving a huge index.html,
+    try using the -m option to ignore small connections. eg "-m 1k".
+  * snoop logs may actually work better. Snoop logs are based on RFC1761,
+    however there are many variants of tcpdump/libpcap and this program
+    cannot read them all. If you have Ethereal you can create snoop logs
+    during the "save as" option. On Solaris use "snoop -o logfile".
+  * tcpdump logs may not be portable between OSs that use different sized
+    timestamps or endian.
+  * Logs are best created in a memory filesystem for speed, usually /tmp.
+  * For X11 or VNC playbacks, first practise by replaying a recent captured
+    session of your own. The biggest problem is color depth, your screen
+    must match the capture. For X11 check authentication (xhost +), for
+    VNC check the viewers options (-8bit, "Hextile", ...)
+  * SSH analysis can be performed with the "sshkeydata" program as
+    demonstrated on http://www.brendangregg.com/sshanalysis.html .
+    chaosreader provides the input files (*.keydata) that sshkeydata
+    analyses.
+
+BUGS
+  * The following assumptions may cause problems (check for new vers);
+  * A lower port number = the service type. Eg with ports 31247 and 23,
+    the actual type of session is telnet (23). This may not work for
+    some things (eg, VNC).
+  * Time based order is more important for 2-way sessions (eg telnet), 
+    SEQ order is more import for 1-way transfers (eg ftp-data).
+  * One particular TCP session isn't active for long enough that the SEQ
+    number loops (or even wraps).
+
+EXAMPLES
+  * Example 1:
+
+    tcpdump \-s9000 \-w out1; chaosreader out1; netscape index.html
+
+    or,
+
+    snoop -o out1; chaosreader out1; netscape index.html
+
+    or,
+
+    ethereal (save as "out1"); chaosreader out1; netscape index.html
+
+    or,
+
+    chaosreader -s 5; netscape index.html
+
+  * Example 2:
+
+    tcpdump \-s9000 \-w output1        # create tcpdump capture file
+
+    chaosreader output1              # extract recognised sessions, or,
+
+    chaosreader \-ve output1          # gimme everything, or,
+
+    chaosreader \-p 20,21,23 output1  # only ftp and telnet...
+
+  * Example 3:
+
+    snoop \-o output1                 # create snoop capture file instead
+
+    chaosreader output1              # extract recognised sessions...
+
+  * Example 4:
+
+    chaosreader \-S 2,5      # Standalone, sniff network 5 times for 2 mins
+                            each. View index.html for progress (or .text)
+
+SEE ALSO
+  tcpdump(8), chaosreader help page.
+
+AUTHORS
+  chaosreader was written by Brendan Gregg.
+
+  This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org> for the Debian project (but may be used by others).
diff --git a/debian/manpage/create-man.sh b/debian/manpage/create-man.sh
new file mode 100755
index 0000000..a2d8c7e
--- /dev/null
+++ b/debian/manpage/create-man.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# by Eriberto
+# Create the manpage using txt2man command.
+
+T2M_DATE="27 Dec 2013"
+T2M_NAME=chaosreader
+T2M_VERSION=0.94
+T2M_LEVEL=1
+T2M_DESC="trace network sessions and export it to html format"
+
+# Don't change the following line
+txt2man -d "$T2M_DATE" -t $T2M_NAME -r $T2M_NAME-$T2M_VERSION -s $T2M_LEVEL -v "$T2M_DESC" $T2M_NAME.txt > $T2M_NAME.$T2M_LEVEL
diff --git a/debian/manpages b/debian/manpages
index 890ef12..1a99af9 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/man/chaosreader.1
+debian/manpage/chaosreader.1
diff --git a/debian/patches/01-fix-division.patch b/debian/patches/10_fix-division.patch
similarity index 88%
rename from debian/patches/01-fix-division.patch
rename to debian/patches/10_fix-division.patch
index 0bcd9b1..c949773 100644
--- a/debian/patches/01-fix-division.patch
+++ b/debian/patches/10_fix-division.patch
@@ -1,6 +1,6 @@
+Description: avoid an error because a division by zero.
 Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Description: Avoid an error because a division by zero.
-
+Last-Update: 2009-07-09
 diff -Naurp chaosreader.orig/chaosreader0.94 chaosreader/chaosreader0.94
 --- chaosreader.orig/chaosreader0.94	2009-07-09 12:15:01.000000000 +0000
 +++ chaosreader/chaosreader0.94	2009-07-09 13:43:00.000000000 +0000
diff --git a/debian/patches/02-fix-old-perl.patch b/debian/patches/20_fix-old-perl.patch
similarity index 89%
rename from debian/patches/02-fix-old-perl.patch
rename to debian/patches/20_fix-old-perl.patch
index 8bb5d45..3fc2b97 100644
--- a/debian/patches/02-fix-old-perl.patch
+++ b/debian/patches/20_fix-old-perl.patch
@@ -1,6 +1,6 @@
+Description: remove line used by old perl.
 Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Description: Remove line used by old perl.
-
+Last-Update: 2009-07-09
 diff -Naurp chaosreader.orig/chaosreader0.94 chaosreader/chaosreader0.94
 --- chaosreader.orig/chaosreader0.94	2009-07-09 12:15:01.000000000 +0000
 +++ chaosreader/chaosreader0.94	2009-07-09 13:43:24.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
index 93c32fc..9b51f69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01-fix-division.patch
-02-fix-old-perl.patch
+10_fix-division.patch
+20_fix-old-perl.patch
diff --git a/debian/rules b/debian/rules
index f6f9086..ec7e2cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,11 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_install:
+	dh_auto_install
 	install -D -m 0755 chaosreader0.94 debian/chaosreader/usr/bin/chaosreader
+
+override_dh_installchangelogs:
 	dh_installchangelogs debian/upstream.changelog
diff --git a/debian/watch b/debian/watch
index ee9e36e..3e185bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://sf.net/chaosreader/chaosreader(\d\S+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/chaosreader.git



More information about the forensics-changes mailing list