04_fix_test can be backed out again, it was a backport from cvs to the package

svn:r2775

diff --git a/debian/changelog b/debian/changelog
index 3c8bd019b71f164128317f8faceca1420c5ffbd9..00a09786b29414636ce1008cb588221ee7949e9a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 tor (0.0.8+0.0.9pre5-1) unstable; urgency=low
 
   * New upstream (pre)release.
+  * 04_fix_test can be backed out again.
 
  -- Peter Palfrader <weasel@debian.org>  Wed, 10 Nov 2004 03:26:40 +0100
 

diff --git a/debian/patches/00list b/debian/patches/00list
index e9bc6880302afddd78de811dc06dcc54019b7d78..13c7d1b391d64fb9e27b7306ff88bd4aad905c87 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 01_uncomment_datadirectory.dpatch
 02_add_debian_files_in_manpage.dpatch
 03_tor_manpage_in_section_8.dpatch
-04_fix_test

diff --git a/debian/patches/04_fix_test b/debian/patches/04_fix_test
deleted file mode 100755 (executable)
index f87cc9c..0000000
--- a/debian/patches/04_fix_test
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-## 04_fix_test.dpatch by  <weasel@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad tor-0.0.9pre4/src/or/test.c /tmp/dpep.hUQG4a/tor-0.0.9pre4/src/or/test.c
---- tor-0.0.9pre4/src/or/test.c        2004-10-17 00:14:52.000000000 +0200
-+++ /tmp/dpep.hUQG4a/tor-0.0.9pre4/src/or/test.c       2004-10-17 19:03:33.772660687 +0200
-@@ -919,7 +919,8 @@
-   test_assert(!is_legal_nickname_or_hexdigest("abcdefghijklmnopqrst"));
- 
-   get_platform_str(platform, sizeof(platform));
--
-+  memset(&r1,0,sizeof(r1));
-+  memset(&r2,0,sizeof(r2));
-   r1.address = "testaddr1.foo.bar";
-   r1.addr = 0xc0a80001u; /* 192.168.0.1 */
-   r1.published_on = 0;