Browse code

port the changes to the debian-vidalia page as well.

Andrew Lewman authored on 21/10/2010 00:49:57
Showing 1 changed files
... ...
@@ -10,104 +10,115 @@
10 10
     <a href="<page docs/debian-vidalia>">Vidalia Debian/Ubuntu Instructions</a>
11 11
   </div>
12 12
   <div id="maincol"> 
13
-    <a id="debian"></a>
14
-    <a id="packages"></a>
15
-    <h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
16
-    <br>
17
-    
18
-    <p>
19
-    <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
20
-    and out of date. That means you'll be missing stability and security
21
-    fixes.
22
-    </p>
23
-    
24
-    <p>
25
-    You'll need to set up our package repository before you can fetch
26
-    Vidalia. First, you need to figure out the name of your distribution. If
27
-    you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",
28
-    8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
29
-    Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
30
-    <tt>/etc/apt/sources.list</tt>
31
-    file:<br>
32
-    <pre>
33
-    deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
34
-    </pre>
35
-    where you substitute the above word (etch, lenny, sid, karmic, jaunty,
36
-    intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
37
-    </p>
38
-    
39
-    <p>
40
-    Then add the gpg key used to sign the packages by running the following
41
-    commands at your command prompt:
42
-    <pre>
43
-    gpg --keyserver keys.gnupg.net --recv 886DDD89
44
-    gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
45
-    </pre>
46
-    Now refresh your sources and install Vidalia by running the following
47
-    commands at your command prompt:
48
-    <pre>
49
-    apt-get update
50
-    apt-get install vidalia 
51
-    </pre>
52
-    </p>
53
-    
54
-    <p>
55
-    Now Vidalia is installed and running. Move on to <a href="<page
56
-    docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
57
-    instructions.
58
-    </p>
59
-    
60
-    <p style="font-size: small">
61
-    The DNS name <code>deb.torproject.org</code> is actually a set of independent
62
-    servers in a DNS round robin configuration.  If you for some reason cannot
63
-    access it you might try to use the name of one of its part instead.  Try
64
-    <code>deb-master.torproject.org</code>,
65
-    <code>mirror.netcologne.de</code> or
66
-    <code>vidalia.mirror.youam.de</code>.
67
-    </p>
68
-    
69
-    <hr>
70
-    
71
-    <a id="source"></a>
72
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
73
-    <br>
74
-    
75
-    <p>
76
-    If you want to build your own debs from source you must first add an
77
-    appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
78
-    <pre>
79
-    deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
80
-    </pre>
81
-    You also need to install the necessary packages to build your own debs and the
82
-    packages needed to build Vidalia:
83
-    <pre>
84
-    apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake
85
-    apt-get build-dep vidalia
86
-    </pre>
87
-    Then you can build Vidalia in ~/debian-packages:
88
-    <pre>
89
-    mkdir ~/debian-packages; cd ~/debian-packages
90
-    apt-get source vidalia
91
-    cd vidalia-*
92
-    debuild -rfakeroot -uc -us
93
-    cd ..
94
-    </pre>
95
-    Now you can install the new package:
96
-    <pre>
97
-    sudo dpkg -i vidalia_*.deb
98
-    </pre>
99
-    </p>
100
-    
101
-    <p>
102
-    Now Vidalia is installed and running. Move on to <a href="<page
103
-    docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
104
-    instructions.
105
-    </p>
106
-    
107
-    <hr>
108
-    
109
-    <p>If you have suggestions for improving this document, please <a
110
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
13
+<a id="debian"></a>
14
+<a id="packages"></a>
15
+<h2><a class="anchor" href="#debian">Vidalia on Ubuntu or Debian</a></h2>
16
+<br />
17
+
18
+<p>
19
+<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
20
+and out of date. That means you'll be missing stability and security
21
+fixes.
22
+</p>
23
+
24
+<p>
25
+You'll need to set up our package repository before you can fetch
26
+Tor. First, you need to figure out the name of your distribution. Here's
27
+a quick mapping:
28
+<ul>
29
+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages</li>
30
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
31
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
32
+<li> Ubuntu 9.04 is "jaunty"</li>
33
+<li> Ubuntu 8.10 is "intrepid"</li>
34
+<li> Ubuntu 8.04 is "hardy"</li> 
35
+<li> Debian Etch is "etch"</li>
36
+<li> Debian Lenny is "lenny"</li>
37
+</ul>
38
+
39
+Then add this line to your
40
+<tt>/etc/apt/sources.list</tt>
41
+file:<br />
42
+<pre>
43
+deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
44
+</pre>
45
+where you substitute the above word (etch, lenny, sid, karmic, jaunty,
46
+intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
47
+</p>
48
+
49
+<p>
50
+Then add the gpg key used to sign the packages by running the following
51
+commands at your command prompt:
52
+<pre>
53
+gpg --keyserver keys.gnupg.net --recv 886DDD89
54
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
55
+</pre>
56
+Now refresh your sources and install Vidalia by running the following
57
+commands at your command prompt:
58
+<pre>
59
+apt-get update
60
+apt-get install vidalia 
61
+</pre>
62
+</p>
63
+
64
+<p>
65
+Now Vidalia is installed and running. Move on to <a href="<page
66
+docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
67
+instructions.
68
+</p>
69
+
70
+<p style="font-size: small">
71
+The DNS name <code>deb.torproject.org</code> is actually a set of independent
72
+servers in a DNS round robin configuration.  If you for some reason cannot
73
+access it you might try to use the name of one of its part instead.  Try
74
+<code>deb-master.torproject.org</code>,
75
+<code>mirror.netcologne.de</code> or
76
+<code>vidalia.mirror.youam.de</code>.
77
+</p>
78
+
79
+<hr />
80
+
81
+<a id="source"></a>
82
+<h2><a class="anchor" href="#source">Building from source</a></h2>
83
+<br />
84
+
85
+<p>
86
+If you want to build your own debs from source you must first add an
87
+appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
88
+<pre>
89
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
90
+</pre>
91
+You also need to install the necessary packages to build your own debs and the
92
+packages needed to build Vidalia:
93
+<pre>
94
+apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake
95
+apt-get build-dep vidalia
96
+</pre>
97
+Then you can build Vidalia in ~/debian-packages:
98
+<pre>
99
+mkdir ~/debian-packages; cd ~/debian-packages
100
+apt-get source vidalia
101
+cd vidalia-*
102
+debuild -rfakeroot -uc -us
103
+cd ..
104
+</pre>
105
+Now you can install the new package:
106
+<pre>
107
+sudo dpkg -i vidalia_*.deb
108
+</pre>
109
+</p>
110
+
111
+<p>
112
+Now Vidalia is installed and running. Move on to <a href="<page
113
+docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix"
114
+instructions.
115
+</p>
116
+
117
+<hr />
118
+
119
+<p>If you have suggestions for improving this document, please <a
120
+href="<page about/contact>">send them to us</a>. Thanks!</p>
121
+
111 122
   </div>
112 123
   <!-- END MAINCOL -->
113 124
   <div id = "sidecol">