New upstream version. Tor stays in sbin in Debian

svn:r1137

diff --git a/debian/changelog b/debian/changelog
index 987d9c2df31a1a90585d102619ac5949328c3b73..f4c0d71219081dc55710cedb463b9fca513cbf89 100644 (file)
--- 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 3874318a1bfc9c7114391a89c8478589e0c847db..51c1514d0fc1fa63e0b90ff1bf4e24ba280126b9 100755 (executable)
--- 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 3ac6b93053364283a0b25946c184bdd83f34a05f..ca9f98af2daf49f6ddd7296e02ff97f018345779 100644 (file)
--- 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 2a037ee5aeba1a95b1149600e89244482c3c6867..6643cc264760bafb6a594018c0f634202fb3d975 100644 (file)
--- 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