[or-cvs] Forward port to head

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian
In directory moria:/tmp/cvs-serv12258

Modified Files:
	changelog rules 
Log Message:
Forward port to head

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- changelog	14 Sep 2005 13:05:58 -0000	1.130
+++ changelog	14 Sep 2005 14:45:02 -0000	1.131
@@ -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 at 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.

Index: rules
===================================================================
RCS file: /home/or/cvsroot/tor/debian/rules,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rules	14 Sep 2005 13:05:58 -0000	1.21
+++ rules	14 Sep 2005 14:45:02 -0000	1.22
@@ -154,6 +154,9 @@
 
 	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