diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/tor.dirs | 2 | ||||
| -rw-r--r-- | debian/tor.init | 2 |
4 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 987d9c2df3..f4c0d71219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +tor (0.0.1+0.0.2pre22-1) unstable; urgency=low + + * New upstream release. + * Upstream has moved tor back to usr/bin, but we will keep it in + usr/sbin. That's the right place and it doesn't break my tab + completion there. + + -- Peter Palfrader <weasel@debian.org> Fri, 27 Feb 2004 01:59:09 +0100 + tor (0.0.1+0.0.2pre21-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index 3874318a1b..51c1514d0f 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,8 @@ install: build dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tor + # move tor to where it belongs + mv $(CURDIR)/debian/tor/usr/bin/tor $(CURDIR)/debian/tor/usr/sbin/tor install -m 755 contrib/torify $(CURDIR)/debian/tor/usr/bin install -m 644 contrib/torify.1 $(CURDIR)/debian/tor/usr/share/man/man1 install -m 644 contrib/tor-tsocks.conf $(CURDIR)/debian/tor/etc/tor diff --git a/debian/tor.dirs b/debian/tor.dirs index 3ac6b93053..ca9f98af2d 100644 --- a/debian/tor.dirs +++ b/debian/tor.dirs @@ -3,3 +3,5 @@ var/lib/tor var/log/tor var/run/tor usr/share/lintian/overrides +usr/bin +usr/sbin diff --git a/debian/tor.init b/debian/tor.init index 2a037ee5ae..6643cc2647 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -1,7 +1,7 @@ #! /bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/tor +DAEMON=/usr/sbin/tor NAME=tor DESC="tor daemon" TORLOG=/var/log/tor/log |