From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 30 Mar 2004 12:29:33 +0000 (+0000)
Subject: Keep using torrc instead of torrc.sample as dpkg handles conffile upgrades.
X-Git-Tag: tor-0.0.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f058d9971254a15919349dfe2bbbf23ec7b3d319;p=thirdparty%2Ftor.git

Keep using torrc instead of torrc.sample as dpkg handles conffile upgrades.


svn:r1387
---

diff --git a/debian/changelog b/debian/changelog
index 2e28e517e3..ecb1b36725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
 
diff --git a/debian/patches/01_uncomment_datadirectory.dpatch b/debian/patches/01_uncomment_datadirectory.dpatch
index 8f1081d5b9..112399b64b 100755
--- a/debian/patches/01_uncomment_datadirectory.dpatch
+++ b/debian/patches/01_uncomment_datadirectory.dpatch
@@ -23,9 +23,9 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /home/weasel/projects/tor/cvs/src/config/torrc.in cvs/src/config/torrc.in
---- /home/weasel/projects/tor/cvs/src/config/torrc.in	2004-03-01 23:41:26.000000000 +0100
-+++ cvs/src/config/torrc.in	2004-03-03 13:47:25.000000000 +0100
+diff -urNad /home/weasel/projects/tor/cvs/src/config/torrc.sample.in cvs/src/config/torrc.sample.in
+--- /home/weasel/projects/tor/cvs/src/config/torrc.sample.in	2004-03-01 23:41:26.000000000 +0100
++++ cvs/src/config/torrc.sample.in	2004-03-03 13:47:25.000000000 +0100
 @@ -11,7 +11,7 @@
  ##################### Below is just for servers #####################
  
diff --git a/debian/rules b/debian/rules
index 8646e93c32..31aeb9ddb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ install: build
 
 	$(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