[or-cvs] New upstream version. Tor stays in sbin in Debian

[Peter Palfrader]

Update of /home/or/cvsroot/debian
In directory moria.mit.edu:/tmp/cvs-serv3658

Modified Files:
	changelog rules tor.dirs tor.init 
Log Message:
New upstream version.  Tor stays in sbin in Debian

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/debian/changelog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- changelog	18 Feb 2004 09:13:33 -0000	1.13
+++ changelog	27 Feb 2004 01:07:38 -0000	1.14
@@ -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 at debian.org>  Fri, 27 Feb 2004 01:59:09 +0100
+
 tor (0.0.1+0.0.2pre21-1) unstable; urgency=low
 
   * New upstream release.

Index: rules
===================================================================
RCS file: /home/or/cvsroot/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules	17 Feb 2004 01:40:36 -0000	1.4
+++ rules	27 Feb 2004 01:07:38 -0000	1.5
@@ -63,6 +63,8 @@
 	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

Index: tor.dirs
===================================================================
RCS file: /home/or/cvsroot/debian/tor.dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tor.dirs	17 Feb 2004 01:40:36 -0000	1.2
+++ tor.dirs	27 Feb 2004 01:07:38 -0000	1.3
@@ -3,3 +3,5 @@
 var/log/tor
 var/run/tor
 usr/share/lintian/overrides
+usr/bin
+usr/sbin

Index: tor.init
===================================================================
RCS file: /home/or/cvsroot/debian/tor.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tor.init	25 Feb 2004 06:42:20 -0000	1.3
+++ tor.init	27 Feb 2004 01:07:38 -0000	1.4
@@ -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