And forward port patches

svn:r18195

diff --git a/debian/changelog b/debian/changelog
index e54109661482debdd54c2912276d7bb3d3761a2d..7433f7cc6c1989bc59e7e59907b9d5a3df64c345 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ tor (0.2.1.11-alpha-1) experimental; urgency=high
     - torify(1) manpage mentions DNS leaks now (closes: #495829).
   * README.Debian: No longer claim we change the default 'Group' setting
     when run as debian-user.  That setting no longer exists.
+  * Forward port 03_tor_manpage_in_section_8.dpatch.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 21 Jan 2009 00:55:19 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 21 Jan 2009 01:00:15 +0100
 
 tor (0.2.1.10-alpha-1) experimental; 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 1c498d7f5f45e2af66cb093117c1b621aa01c990..28bbf957c0b4c4c9aeb8b4c51f10939e48a20e0b 100755 (executable)
--- a/debian/patches/03_tor_manpage_in_section_8.dpatch
+++ b/debian/patches/03_tor_manpage_in_section_8.dpatch
@@ -32,8 +32,8 @@ diff -urNad tor-0.1.1.5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.1.1.5/contrib/to
  .SH SEE ALSO
 -.BR tor (1),
 +.BR tor (8),
+ .BR tor-resolve (1),
  .BR tsocks (1),
- .BR tsocks.conf (5).
 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