~ubuntu-branches/ubuntu/edgy/tor/edgy

« back to all changes in this revision

Viewing changes to debian/patches/01_uncomment_datadirectory.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Peter Palfrader
  • Date: 2004-06-07 21:46:08 UTC
  • Revision ID: james.westby@ubuntu.com-20040607214608-sis2wpmt00dfl7bs
Tags: 0.0.7-1
New upstream version
closes: #249893: FTBFS on ia64

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh -e
 
2
## 01_uncomment_datadirectory.dpatch by  <weasel@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
if [ $# -lt 1 ]; then
 
8
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
9
    exit 1
 
10
fi
 
11
 
 
12
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
13
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
 
14
 
 
15
case "$1" in
 
16
    -patch) patch -p1 ${patch_opts} < $0;;
 
17
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
 
18
    *)
 
19
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
20
        exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
 
 
25
@DPATCH@
 
26
diff -urNad /home/weasel/projects/tor/cvs/src/config/torrc.sample.in cvs/src/config/torrc.sample.in
 
27
--- /home/weasel/projects/tor/cvs/src/config/torrc.sample.in    2004-03-01 23:41:26.000000000 +0100
 
28
+++ cvs/src/config/torrc.sample.in      2004-03-03 13:47:25.000000000 +0100
 
29
@@ -11,7 +11,7 @@
 
30
 ##################### Below is just for servers #####################
 
31
 
 
32
 ## The directory for keeping all the keys/etc for this server
 
33
-#DataDirectory @LOCALSTATEDIR@/lib/tor
 
34
+DataDirectory @LOCALSTATEDIR@/lib/tor
 
35
 
 
36
 #Nickname moria # A unique handle for this server
 
37
 #Address moria.seul.org # The fqdn for this server