Forward port to head

svn:r5056
This commit is contained in:
Peter Palfrader 2005-09-14 14:45:02 +00:00
parent e4ee8a0069
commit 2034c48f33
2 changed files with 11 additions and 0 deletions

8
debian/changelog vendored
View File

@ -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.

3
debian/rules vendored
View File

@ -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