[Forensics-changes] [SCM] trace network sessions and export it to html format branch, debian, updated. debian/0.94-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit af885f60a20b409222fd261f770256fae7d35762
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 9 15:44:19 2009 +0200

    Using quilt rather than dpatch.

diff --git a/debian/control b/debian/control
index 897774c..8433133 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt
 Standards-Version: 3.8.2
 Homepage: http://chaosreader.sourceforge.net
 
diff --git a/debian/patches/01-fix-division.patch b/debian/patches/01-fix-division.patch
new file mode 100644
index 0000000..02481d4
--- /dev/null
+++ b/debian/patches/01-fix-division.patch
@@ -0,0 +1,14 @@
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Description: Avoid an error because a division by zero.
+
+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
+@@ -4028,6 +4028,7 @@ 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/patches/01_fix_division.dpatch b/debian/patches/01_fix_division.dpatch
deleted file mode 100644
index 941caed..0000000
--- a/debian/patches/01_fix_division.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_division.dpatch by Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid an error because a division by zero.
-
- at DPATCH@
-diff -urNad chaosreader-0.94~/chaosreader0.94 chaosreader-0.94/chaosreader0.94
---- chaosreader-0.94~/chaosreader0.94	2008-08-23 11:27:21.000000000 -0300
-+++ chaosreader-0.94/chaosreader0.94	2008-08-23 12:01:01.000000000 -0300
-@@ -4028,6 +4028,7 @@
- 	   ### 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/patches/02-fix-old-perl.patch b/debian/patches/02-fix-old-perl.patch
new file mode 100644
index 0000000..34e2d5c
--- /dev/null
+++ b/debian/patches/02-fix-old-perl.patch
@@ -0,0 +1,15 @@
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Description: Remove line used by old perl.
+
+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
+@@ -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
diff --git a/debian/patches/02_fix_old_perl.dpatch b/debian/patches/02_fix_old_perl.dpatch
deleted file mode 100644
index 7942706..0000000
--- a/debian/patches/02_fix_old_perl.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_old_perl.dpatch by Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove line used by old perl.
-
- at DPATCH@
-diff -urNad chaosreader-0.94~/chaosreader0.94 chaosreader-0.94/chaosreader0.94
---- chaosreader-0.94~/chaosreader0.94	2008-08-23 12:50:09.000000000 -0300
-+++ chaosreader-0.94/chaosreader0.94	2008-08-23 12:50:31.000000000 -0300
-@@ -262,7 +262,7 @@
- #  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
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 889ea62..59e4855 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean
 
-install: patch-stamp
+install: patch
 	dh_testdir
 	dh_testroot
 	dh_prep

-- 
trace network sessions and export it to html format