Move tor back to usr/bin

debian/changelog

@@ -3,6 +3,11 @@ tor (0.2.5.0-alpha-dev-1) UNRELEASED; urgency=low
   * No longer change tor manpage to be in section 8.
   * No longer install contrib/tor-tsocks.conf into /etc/tor - it was
     dropped upstream.
+  * No longer move tor from usr/bin to /usr/sbin after make install.
+    We now install tor into the same place as upstream.  Having it in
+    the default user path makes it easier for users who want to run
+    tor themselves.
+  * Install a compatibility symlink in /usr/sbin.
 
  -- Peter Palfrader <weasel@debian.org>  Wed, 10 Apr 2013 10:33:02 +0200
 

debian/rules

@@ -129,9 +129,8 @@ install: build
 	dh_lintian
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tor
-	# move tor to where it belongs
+	# move tor things around
 	mv $(CURDIR)/debian/tor/etc/tor/torrc.sample $(CURDIR)/debian/tor/etc/tor/torrc
-	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 debian/tor-service-defaults-torrc $(CURDIR)/debian/tor/usr/share/tor

debian/tor.apparmor-profile.abstraction

@@ -13,6 +13,7 @@
   capability setgid,
   capability setuid,
 
+  /usr/bin/tor r,
   /usr/sbin/tor r,
 
   /proc/sys/kernel/random/uuid r,

debian/tor.dirs

@@ -3,5 +3,4 @@ etc/tor
 var/lib/tor
 var/log/tor
 usr/bin
-usr/sbin
 usr/share/tor

debian/tor.init

@@ -20,8 +20,8 @@
 # Define LSB log_* functions.
 . /lib/lsb/init-functions
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/tor
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/tor
 NAME=tor
 DESC="tor daemon"
 TORPIDDIR=/var/run/tor

debian/tor.links

 /usr/share/man/man1/tor.1 /usr/share/man/man5/torrc.5
+/usr/bin/tor /usr/sbin/tor