[or-cvs] [tor/master] Forward port patches/03_tor_manpage_in_section_8.dpatch

[nickm@xxxxxxxx (Nick Mathewson)]

Author: Peter Palfrader <peter@xxxxxxxxxxxxx>
Date: Thu, 3 Sep 2009 15:07:08 +0200
Subject: Forward port patches/03_tor_manpage_in_section_8.dpatch
Commit: 7dba7dcf718b8e4776c0003c90a8eb2e36428e96

---
 debian/changelog                                  |    3 ++-
 debian/patches/03_tor_manpage_in_section_8.dpatch |    7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d9c71f..f6af5a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 tor (0.2.2.1-alpha-1) experimental; urgency=low
 
   * New upstream version.
+  * Forward port patches/03_tor_manpage_in_section_8.dpatch.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Thu, 03 Sep 2009 14:46:17 +0200
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Thu, 03 Sep 2009 15:06:58 +0200
 
 tor (0.2.1.19-1) unstable; urgency=low
 
diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch
index 28bbf95..ece1fe6 100755
--- a/debian/patches/03_tor_manpage_in_section_8.dpatch
+++ b/debian/patches/03_tor_manpage_in_section_8.dpatch
@@ -26,20 +26,21 @@ exit 0
 diff -urNad tor-0.1.1.5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/torify.1
 --- tor-0.1.1.5/contrib/torify.1
 +++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/torify.1
-@@ -18,6 +18,6 @@
+@@ -35,7 +35,7 @@
  to suid binaries.
  
  .SH SEE ALSO
 -.BR tor (1),
 +.BR tor (8),
  .BR tor-resolve (1),
+ .BR torsocks (1),
  .BR tsocks (1),
 diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
 --- tor-0.1.1.5/doc/tor.1.in
 +++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
 @@ -1,4 +1,4 @@
--.TH TOR 1 "January 2009" "TOR"
-+.TH TOR 8 "January 2009" "TOR"
+-.TH TOR 1 "August 2009" "TOR"
++.TH TOR 8 "August 2009" "TOR"
  .SH NAME
  tor \- The second-generation onion router
  .SH SYNOPSIS
-- 
1.5.6.5