Forward port to head

svn:r5056

2 files changed, 11 insertions, 0 deletions

diff --git a/changelog b/changelog
index e4bae69998..cf00327ff2 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+tor (0.1.1.6-alphaXX) experimental; urgency=low
+
+  * More merging from 0.1.0.14+XXXX:
+    - The tor-dbg package does not really need its own copy of copyright
+      and changelog in usr/share/doc/tor-dbg.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 14 Sep 2005 16:44:26 +0200
+
 tor (0.1.1.6-alpha-2) experimental; urgency=low
 
   * Merge 0.1.0.14+XXXX changes.
diff --git a/rules b/rules
index 1adeb8e0fd..25c16e25f9 100755
--- a/rules
+++ b/rules
@@ -154,6 +154,9 @@ install: build
 
 	rm -f $(CURDIR)/debian/tor/usr/bin/tor-control.py
 
+	install -d -m 755 $(CURDIR)/debian/tor-dbg/usr/share/doc
+	ln -s tor $(CURDIR)/debian/tor-dbg/usr/share/doc/tor-dbg
+
 
 # Build architecture-independent files here.
 binary-indep: build install