[or-cvs] Keep using torrc instead of torrc.sample as dpkg handles co...

[Peter Palfrader]

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

Modified Files:
	changelog rules 
Log Message:
Keep using torrc instead of torrc.sample as dpkg handles conffile upgrades.

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/debian/changelog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- changelog	30 Mar 2004 00:08:45 -0000	1.28
+++ changelog	30 Mar 2004 12:29:33 -0000	1.29
@@ -1,6 +1,5 @@
 tor (1) UNRELEASED; urgency=low
 
-    FIXME
   * Upstream installs a torrc.sample file now, rather than torrc.
     Keep using torrc as dpkg handles conffile upgrades.
 

Index: rules
===================================================================
RCS file: /home/or/cvsroot/debian/rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rules	3 Mar 2004 12:56:04 -0000	1.8
+++ rules	30 Mar 2004 12:29:33 -0000	1.9
@@ -68,6 +68,7 @@
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tor
 	# move tor to where it belongs
+	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 contrib/torify.1 $(CURDIR)/debian/tor/usr/share/man/man1