diff options
| author | Peter Palfrader <peter@palfrader.org> | 2005-09-14 14:45:02 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2005-09-14 14:45:02 +0000 |
| commit | 2034c48f33752f984c4173e7063d93df79966ca0 (patch) | |
| tree | 478209c8b04117201bbf23d4e363b65f1be56d00 /debian | |
| parent | e4ee8a006949843541ecadcd380d4d7536b0e536 (diff) | |
| download | tor-2034c48f33752f984c4173e7063d93df79966ca0.tar.gz tor-2034c48f33752f984c4173e7063d93df79966ca0.zip | |
Forward port to head
svn:r5056
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e4bae69998..cf00327ff2 100644 --- a/debian/changelog +++ b/debian/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/debian/rules b/debian/rules index 1adeb8e0fd..25c16e25f9 100755 --- a/debian/rules +++ b/debian/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 |