[Pkg-privacy-commits] [vidalia] 56/160: Prompt through debconf scripts user addition on debian-tor group. Started translation round, got a PT and RU already. Cleaning up unused scripts, files and confs.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository vidalia.
commit 11844f2d8e5799fe34a981be14f273450facfbf0
Author: Dererk <dererk at madap.com.ar>
Date: Thu Jun 23 15:15:53 2011 -0300
Prompt through debconf scripts user addition on debian-tor group.
Started translation round, got a PT and RU already.
Cleaning up unused scripts, files and confs.
---
experimental/NEWS | 21 ++++++++++
experimental/README.Debian | 26 +++++++++++-
experimental/changelog | 14 +++++--
experimental/config | 75 +++++++++++++---------------------
experimental/control | 5 ++-
experimental/default.tor-off | 3 --
experimental/default.tor-on | 1 -
experimental/po/ca.po | 27 +++---------
experimental/po/cs.po | 25 +++---------
experimental/po/da.po | 24 ++---------
experimental/po/de.po | 27 +++---------
experimental/po/es.po | 24 ++---------
experimental/po/fr.po | 26 +++---------
experimental/po/it.po | 26 +++---------
experimental/po/pt.po | 44 +++++++++-----------
experimental/po/ru.po | 46 +++++++++------------
experimental/po/sv.po | 28 ++++---------
experimental/po/templates.pot | 55 +++++--------------------
experimental/po/vi.po | 32 +++++----------
experimental/po/zh_CN.po | 22 ++--------
experimental/po/zh_TW.po | 22 ++--------
experimental/rules | 4 +-
experimental/templates | 27 +++---------
experimental/vidalia.install | 2 -
experimental/vidalia.lintian-overrides | 1 -
25 files changed, 208 insertions(+), 399 deletions(-)
diff --git a/experimental/NEWS b/experimental/NEWS
new file mode 100644
index 0000000..a63e2dd
--- /dev/null
+++ b/experimental/NEWS
@@ -0,0 +1,21 @@
+vidalia (0.3.0alpha-2) experimental; urgency=low
+
+ As #552556 got solved up through the years, really great news come up today
+ .
+ Having "Control Socket" enabled by default on Tor package lets us to
+ turn to almost zero configuration required for Vidalia users to run Tor
+ .
+ This means we are be able to speak, through a local Unix socket, with Tor
+ directly with no extra authentication required
+ .
+ Although this could appear to be frightening, basic POSIX permissions
+ are still required to access this socket, which, except in the case
+ you screw up your system, is pretty fair
+ .
+ To put things into perspective, most of all services on your system, even
+ the more sensible ones, have been secured this way over many decades,
+ so don't get stressed out! :-)
+ .
+ Kudos to Weasel&&everyone involved in this awesome goal.
+
+ -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
diff --git a/experimental/README.Debian b/experimental/README.Debian
index 0909d70..4a38d64 100644
--- a/experimental/README.Debian
+++ b/experimental/README.Debian
@@ -1,6 +1,30 @@
Vidalia for Debian
------------------
+
+ ---------------------------
+ DEPRECATED (or so)
+ ---------------------------
+
+
+
+Currently, Vidalia speaks directly through a socket to Tor, only required
+ steps to perform is to answer properly at Debconf templates for adding
+ Vidalia users into debian-tor group, who owns Tor's Control Socket.
+
+
+The following documentation is still valid, although its not expected for
+ for you to perform ANY of this steps to get Vidalia running.
+
+
+
+
+ ---------------------------
+ DEPRECATED (or so)
+ ---------------------------
+
+
+
For the anxious and impatient
-----------------------------
@@ -134,4 +158,4 @@ Vidalia supports three different ways of talking to Tor:
- -- Ulises Vitulli <dererk at debian.org> Tue, 19 Apr 2011 10:08:00 -0300
+ -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
diff --git a/experimental/changelog b/experimental/changelog
index 4a09a10..a0e9b14 100644
--- a/experimental/changelog
+++ b/experimental/changelog
@@ -1,10 +1,16 @@
vidalia (0.3.0alpha-2) experimental; urgency=low
* The 'uipiiii' dupload.
- * Apply local patch for using Control Socket by default. This will allow
- users to handle Tor with zero configuration.
-
- -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 10:46:24 -0300
+ * Apply local patch for using 'Control Socket' by default.
+ This will allow users to use Tor with zero conf (adopt wicd's
+ debconf scripts to add Vidalia users into Tor's group).
+ * Modifications introduced on Debconf templates, translation round:
+ - Portuguese, thanks Américo Monteiro.
+ - Russian, thanks Yuri Kozlov (Closes: #631418).
+ * Improve building targets for simplifying portscripts.
+ * Implement NEWS.Debian, quick pkg updates will be reported there.
+
+ -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 14:49:26 -0300
vidalia (0.3.0alpha-1) experimental; urgency=low
diff --git a/experimental/config b/experimental/config
index d7c5054..da17020 100644
--- a/experimental/config
+++ b/experimental/config
@@ -5,52 +5,35 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule
fi
-seen='false'
-askuser() {
- question='vidalia/tor-daemon-interaction'
- db_input high $question || true
- db_go || true
- db_get $question
-}
-
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
- if dpkg -l tor > /dev/null 2>&1; then
- # installed
- if [ -e '/var/run/tor/tor.pid' ] || [ "$1" = "reconfigure" ]; then
- # and already running
- askuser
- seen='true'
- case "$RET" in
- (nothing)
- if [ -f /etc/default/tor.vidalia ]; then
- ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
- fi
- ;;
- (one-off)
- invoke-rc.d --force tor stop
- if [ -f /etc/default/tor.vidalia ]; then
- ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
- fi
- ;;
- (permanent)
- invoke-rc.d --force tor stop
- ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
- ;;
- esac
- fi
- fi
-
- if pgrep -x tor > /dev/null 2>&1; then
- # still running?? (e.g. chroot)
- if [ "$seen" = "false" ]; then
- askuser
- if [ "$RET" = "one-off" ] || [ "$RET" = "permanent" ]; then
- echo -n "Stopping tor daemon: "
- pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
- fi
- fi
- fi
- db_stop
+## Addopt Wicd-Netdev interaction approach.
+# Fix upgrades from broken experimental version
+db_get vidalia/users
+if [ -n "$( echo $RET | grep \${ )" ]; then
+ db_set vidalia/users ""
+ db_fset vidalia/users seen false
fi
+db_metaget vidalia/users users
+users="$(getent passwd | awk -F: '{if ($3 >= 1000 && $3 < 60000) print $1}' | sort | tr '\n' ',' | sed 's@,@, @g;s@, $@@g')"
+debiantor=$(getent group debian-tor | cut -d: -f4 | sed -e 's@,@ @g')
+
+# Don't show users already in debian-tor
+for u in $debiantor; do
+ users=$(echo $users | sed "s@$u, @@g;s@, $u\$@@g;s@^$u\$@@g");
+done
+
+db_subst vidalia/users users "$users"
+
+db_input high vidalia/users || true
+db_go
+
+db_get vidalia/users
+users=$(echo $RET | sed -e 's@,@@g')
+
+# Add selected users
+for u in $users; do
+ adduser --quiet $u debian-tor
+done
+
+
#DEBHELPER#
diff --git a/experimental/control b/experimental/control
index fc27492..c9fcf4a 100644
--- a/experimental/control
+++ b/experimental/control
@@ -11,8 +11,9 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git
Package: vidalia
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>=1.5.11) | debconf-2.0, ucf
-Recommends: tor (>= 0.2.2.29-beta-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>=1.5.11) | debconf-2.0,
+ ucf, adduser
+Recommends: tor
Suggests: iceweasel-torbutton
Description: controller GUI for Tor
Vidalia offers a graphical user interface to start and stop Tor, view
diff --git a/experimental/default.tor-off b/experimental/default.tor-off
deleted file mode 100644
index 3e6dae2..0000000
--- a/experimental/default.tor-off
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/vidalia ]; then
- RUN_DAEMON=no
-fi
diff --git a/experimental/default.tor-on b/experimental/default.tor-on
deleted file mode 100644
index 1e0ca6a..0000000
--- a/experimental/default.tor-on
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/experimental/po/ca.po b/experimental/po/ca.po
index b4b328f..32c33b9 100644
--- a/experimental/po/ca.po
+++ b/experimental/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.9-1\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2008-09-17 16:17-0300\n"
"Last-Translator: Ulises Vitulli <uvitulli at fi.uba.ar>\n"
"Language-Team: \n"
@@ -19,25 +19,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Sense configuració"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Reinicia una vegada"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Control permanent"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interacció Tor/Vidalia"
+msgstr ""
#. Type: select
#. Description
@@ -58,19 +58,4 @@ msgid ""
" * Permanent takeover:\n"
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
-msgstr "Vidalia ho necessita per comunicar-se amb el dimoni que s'executa "
-"de manera que pot proporcionar una interfície d'usuari gràfica per ell. "
-" Açò necessita que es reconfigure manualment Tor per a que permeta una "
-"autentificació segura (el recomanat) o que es reinicie Tor amb el control"
-"de Vidalia.\n"
-" * Sense configuració:\n"
-" deixa Tor funcionant per ara. Vidalia no es podrà comunicar\n"
-" amb Tor fins que es reconfigure de forma manual - vegeu\n"
-" \"/usr/share/doc/vidalia/README.Debian\" per obtenir més detalls;\n"
-" * Reinicia una vegada:\n"
-" atura Tor ara de manera que Vidalia el puga engegar, tan sols esta\n"
-" vegada - Tor s'arrencarà automàticament en els reinicis, de manera\n"
-" que la configuració manual encara farà falta\n"
-" * Control permanent:\n"
-" atura Tor i permet simplement a Vidalia controlar que s'engegarà quan\n"
-" s'executa Vidalia (no es pot utilitzar en sistemes multiusuari)."
+msgstr ""
diff --git a/experimental/po/cs.po b/experimental/po/cs.po
index 03ccb9b..b1badfb 100644
--- a/experimental/po/cs.po
+++ b/experimental/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.1.13-3\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-27 19:28+0200\n"
"Last-Translator: Martin Sin <martin.sin at zshk.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -18,25 +18,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Bez nastavení"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Jeden restart"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Ovládání natrvalo"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Vztah Tor/Vidalia"
+msgstr ""
#. Type: select
#. Description
@@ -58,18 +58,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia komunikuje s běžícím daemonem Tor a vytváří k němu grafické "
-"uživatelské rozhraní. Pro zapnutí bezpečné autentizace (doporučeno) se "
-"vyžaduje ruční přenastavení Tor nebo restart Tor přímo pomocí Vidalia.\n"
-" * Bez nastavení:\n"
-" nechá Tor běžet. Vidalia nebude moci komunikovat s\n"
-" Tor dokud ho ručně nenastavíte - pro více informací se podívejte\n"
-" na soubor „/usr/share/doc/vidalia/README.Debian“;\n"
-" * Jeden restart:\n"
-" Vidalia vypne Tor a pak ho znovu zapne, pouze jednou - po restartu\n"
-" se Tor spustí opět sám, takže bude nutné provést některé ruční\n"
-" nastavení programu;\n"
-" * Ovládání natrvalo:\n"
-" ukončí Tor a o zbytek se bude starat Vidalia sama\n"
-" (nehodí se pro více-uživatelské systémy)."
-
diff --git a/experimental/po/da.po b/experimental/po/da.po
index 06d423d..51d4896 100644
--- a/experimental/po/da.po
+++ b/experimental/po/da.po
@@ -20,25 +20,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Ingen konfiguration"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Engangsgenstart"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Permanent overtagelse"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interaktion mellem Tor/Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -60,19 +60,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia har brug for at kommunikere med den kørende Tordæmon, så den kan "
-"tilbyde en grafisk brugergrænseflade. Dette kræver enten en manuel "
-"rekonfiguration af Tor, så sikker godkendelse tillades (anbefales) eller "
-"en genstart af Tor under Vidalias kontrol.\n"
-" * Ingen konfiguration:\n"
-" lad Tor kører indtil videre. Vidalia vil ikke være i stand til\n"
-" at kommunikere med Tor, før den er manuelt rekonfigureret - se \n"
-" »/usr/share/doc/vidalia/README.Debian« for yderligere detaljer;\n"
-" * Engangsgenstart:\n"
-" stop Tor nu så Vidalia kan starte Tor, kun denne ene gang - Tor\n"
-" vil starte selv ved genstarter, så manuel konfiguration vil stadig\n"
-" være krævet;\n"
-" * Permanent overtagelse:\n"
-" stop Tor og lad Vidalia håndtere igangsættelse af Tor så snart du\n"
-" kører Vidalia (ikke brugbar på flerbrugersystemer)."
-
diff --git a/experimental/po/de.po b/experimental/po/de.po
index 94591ae..9839b94 100644
--- a/experimental/po/de.po
+++ b/experimental/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.10-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-10-04 19:47+0200\n"
"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer at gmx.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -21,25 +21,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Keine Konfiguration"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Einmaliger Neustart"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Ständige Übernahme"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Zusammenarbeit von Tor und Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -61,20 +61,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Damit Vidalia eine grafische Oberfläche für den laufenden Tor-Daemon "
-"bereitstellen kann, muss Vidalia mit ihm kommunizieren. Dies erfordert "
-"entweder die manuelle Neukonfiguration von Tor, um eine sichere "
-"Authentifizierung zu ermöglichen (empfohlen) oder einen von Vidalia "
-"gesteuerten Neustart von Tor.\n"
-" * Keine Konfiguration: \n"
-" Tor vorerst weiterlaufen lassen. Vidalia kann nicht mit Tor\n"
-" kommunizieren, bis er manuell neu konfiguriert wird - siehe\n"
-" »/usr/share/doc/Vidalia/README.Debian« für weitere Einzelheiten.\n"
-"* Einmaliger Neustart:\n"
-" Tor jetzt beenden, damit er dieses eine Mal von Vidalia gestartet\n"
-" wird. Tor startet bei den folgenden Systemstarts eigenständig. Eine\n"
-" manuelle Konfiguration bleibt weiterhin erforderlich.\n"
-" * Dauerhaften Übernahme:\n"
-" Tor beenden und bei jedem Start von Vidalia von ihr steuern lassen\n"
-" (kann auf Mehrbenutzer-Systemen nicht angewendet werden)."
-
diff --git a/experimental/po/es.po b/experimental/po/es.po
index f87698f..16c793e 100644
--- a/experimental/po/es.po
+++ b/experimental/po/es.po
@@ -41,25 +41,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Sin configuración"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Reiniciar sólo una vez"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Ceder el control permanentemente"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Tipo de interacción entre Tor y Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -81,19 +81,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia necesita comunicarse con el demonio en ejecución de Tor de modo que "
-"pueda proporcionar una interfaz gráfica de usuario para éste. Esto requiere "
-"una reconfiguración manual de Tor para permitir autenticación segura "
-"(recomendado) o reiniciar Tor bajo el control de Vidalia.\n"
-" * Sin configuración:\n"
-" dejar Tor en ejecución por ahora. Vidalia no podrá comunicarse con Tor \n"
-" hasta que se reconfigure manualmente, para más detalles vea el archivo \n"
-" «/usr/share/doc/vidalia/README.Debian».\n"
-" * Reiniciar sólo una vez:\n"
-" parar Tor ahora de modo que Vidalia pueda ejecutarlo, sólo una vez, Tor \n"
-" se iniciará al reiniciar el sistema, de modo que todavía se necesitará \n"
-" configuración manual.\n"
-" * Ceder el control permanentemente:\n"
-" parar Tor y dejar a Vidalia que gestione su inicio cuando se ejecute \n"
-" Vidalia (no se puede utilizar en un sistema con varios usuarios)."
-
diff --git a/experimental/po/fr.po b/experimental/po/fr.po
index 4afb0c8..5d66445 100644
--- a/experimental/po/fr.po
+++ b/experimental/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-27 18:21+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -22,25 +22,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Pas de configuration"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Redémarrage ponctuel"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Prise de contrôle permanente"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interaction entre Tor et Vidalia :"
+msgstr ""
#. Type: select
#. Description
@@ -62,19 +62,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia doit communiquer avec le démon en cours de Tor afin de lui fournir "
-"une interface graphique. Pour cela, Tor doit soit être reconfiguré pour "
-"permettre une authentification sûre (option recommandée) ou redémarré sous "
-"le contrôle de Vidalia.\n"
-" * Pas de configuration :\n"
-" Laisser Tor en route maintenant. Vidalia ne pourra pas\n"
-" communiquer avec lui tant que Tor n'est pas reconfiguré. Voir\n"
-" /usr/share/doc/vidalia/README.Debian pour plus d'informations ;\n"
-" * Redémarrage ponctuel :\n"
-" Arrêter Tor maintenant pour que Vidalia puisse le démarrer, juste\n"
-" cette fois-ci. Tor démarrera toujours de lui-même si la machine\n"
-" est relancée donc une configuration manuelle restera nécessaire ;\n"
-" * Prise de contrôle permanente :\n"
-" Arrêter Tor puis laisser Vidalia en gérer le lancement quand il\n"
-" est nécessaire (inutilisable sur un système multi-utilisateurs)."
-
diff --git a/experimental/po/it.po b/experimental/po/it.po
index 532aaa9..a3d3de4 100644
--- a/experimental/po/it.po
+++ b/experimental/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.10-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-27 06:19+0200\n"
"Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,25 +20,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Nessuna configurazione"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Un riavvio"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Gestione permanente"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interazione fra Tor e Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -60,19 +60,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia deve poter comunicare con il demone di Tor in esecuzione, cui potrà "
-"così fornire un'interfaccia grafica. Questo implica o la riconfigurazione "
-"manuale di Tor per permettere un'autenticazione sicura (raccomandato) o un "
-"riavvio di Tor sotto il controllo di Vidalia.\n"
-" * Nessuna configurazione:\n"
-" per intanto lascia Tor in esecuzione. Vidalia non potrà comunicare\n"
-" con Tor finché quest'ultimo non verrà riconfigurato manualmente. Per\n"
-" ulteriori dettagli consultare «/usr/share/doc/vidalia/README.Debian»;\n"
-" * Un riavvio:\n"
-" arresta Tor adesso in modo che possa essere avviato da Vidalia, ma solo\n"
-" per questa volta. Ai prossimi riavvii Tor verrà eseguito autonomamente,\n"
-" per cui sarà comunque necessaria la riconfigurazione manuale;\n"
-" * Gestione permanente:\n"
-" arresta Tor e lascia che Vidalia ne gestisca l'avvio ogni qualvolta\n"
-" Vidalia viene eseguito (non utilizzabile in un sistema multi-utente)."
-
diff --git a/experimental/po/pt.po b/experimental/po/pt.po
index 87c270d..d4ba2f4 100644
--- a/experimental/po/pt.po
+++ b/experimental/po/pt.po
@@ -2,45 +2,45 @@
# Copyright (C) 2008 the vidalia's copyright holder
# This file is distributed under the same license as the vidalia package.
#
-# Américo Monteiro <a_monteiro at netcabo.pt>, 2008, 2010.
+# Américo Monteiro <a_monteiro at netcabo.pt>, 2008, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.10-2\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 07:44+0100\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"PO-Revision-Date: 2011-06-23 17:42+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: select
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Nenhuma Configuração"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Reiniciar uma vez"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Aquisição permanente"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interacção de Tor/Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -62,19 +62,13 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"O vidalia precisa de comunicar com o daemon Tor em execução para que possa "
-"disponibiliza uma interface gráfica de utilizador para ele. Isto requer ou "
-"a reconfiguração manual do Tor para permitir autenticação segura "
-"(recomendado) ou um reiniciar do Tor sob o controlo do Vidalia.\n"
-" * Nenhuma configuração:\n"
-" Deixa o Tor em execução por agora. O Vidalia não poderá\n"
-" comunicar com o Tor até que este seja manualmente reconfigurado - \n"
-" veja \"/usr/share/doc/vidalia/README.Debian\" para mais detalhes;\n"
-" * Reiniciar uma vez:\n"
-" Parar o Tor agora para que o Vidalia o possa arrancar, apenas desta\n"
-" vez - o Tor irá arrancar por si próprio nos arranques do sistema,\n"
-" portanto ainda será necessária configuração manual;\n"
-" * Aquisição permanente:\n"
-" Parar o Tor e simplesmente deixar o Vidalia lidar com o arranque\n"
-" dele sempre que executa o Vidalia (não utilizável em sistemas de\n"
-" vários utilizadores)."
+
+#~ msgid "Users to add to the debian-tor group:"
+#~ msgstr "utilizadores a adicionar ao grupo debian-tor:"
+
+#~ msgid ""
+#~ "Users who should be able to control Tor daemon need to be added to the "
+#~ "group \"debian-tor\"."
+#~ msgstr ""
+#~ "Os utilizadores que devam ser capazes de controlar o daemon do Tor "
+#~ "precisam de ser adicionados ao grupo \"debian-tor\"."
diff --git a/experimental/po/ru.po b/experimental/po/ru.po
index 9d57239..3fb682a 100644
--- a/experimental/po/ru.po
+++ b/experimental/po/ru.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the vidalia package.
#
# Yuri Kozlov <kozlov.y at gmail.com>, 2008.
-# Yuri Kozlov <yuray at komyakino.ru>, 2010.
+# Yuri Kozlov <yuray at komyakino.ru>, 2010, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: vidalia 0.2.10-2\n"
+"Project-Id-Version: vidalia 0.3.0alpha-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
-"PO-Revision-Date: 2010-09-27 20:43+0400\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"PO-Revision-Date: 2011-06-23 21:17+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
"Language: ru\n"
@@ -17,32 +17,32 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: select
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Без настройки"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Однократный перезапуск"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Постоянный захват"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Взаимодействие Tor/Vidalia:"
+msgstr ""
#. Type: select
#. Description
@@ -64,21 +64,13 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Для предоставления пользовательского графического интерфейса Vidalia "
-"требуется обращаться к работающей службе Tor. Для этого требуется "
-"ручная перенастройка Tor, при которой нужно включить безопасную "
-"аутентификацию "
-"(рекомендуется) или перезапуск Tor под управлением Vidalia.\n"
-" * Без настройки:\n"
-" сейчас оставить Tor запущенным. Vidalia не сможет связаться с\n"
-" Tor пока он не будет перенастроен вручную — подробности\n"
-" смотрите в «/usr/share/doc/vidalia/README.Debian»;\n"
-" * Однократный перезапуск:\n"
-" остановить Tor сейчас, чтобы Vidalia смогла его запустить, но\n"
-" только единожды — Tor самостоятельно запустится пере перезагрузке,\n"
-" поэтому всё ещё требуется ручная настройка;\n"
-" * Постоянный захват:\n"
-" остановить Tor и просто позволить Vidalia запускать его когда вы\n"
-" запускаете Vidalia (непригодно для работы в многопользовательской "
-"системе)."
+#~ msgid "Users to add to the debian-tor group:"
+#~ msgstr "Пользователи, добавляемые в группу debian-tor:"
+
+#~ msgid ""
+#~ "Users who should be able to control Tor daemon need to be added to the "
+#~ "group \"debian-tor\"."
+#~ msgstr ""
+#~ "Пользователи, которым нужно управлять службой Tor, должны быть добавлены "
+#~ "в группу «debian-tor»."
diff --git a/experimental/po/sv.po b/experimental/po/sv.po
index fc14b11..a6b083d 100644
--- a/experimental/po/sv.po
+++ b/experimental/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-27 10:49+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -24,31 +24,34 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "Ändra inte inställningar nu"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "Starta om en gång"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Ta över permanent"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Interaktion mellan Tor och Vidalia"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid ""
-"Vidalia needs to communicate with the running Tor daemon so that it can provide a graphical user interface for it. This requires either the manual reconfiguration of Tor to allow secure authentication (recommended) or a restart of Tor under Vidalia's control.\n"
+"Vidalia needs to communicate with the running Tor daemon so that it can "
+"provide a graphical user interface for it. This requires either the manual "
+"reconfiguration of Tor to allow secure authentication (recommended) or a "
+"restart of Tor under Vidalia's control.\n"
" * No configuration:\n"
" leave Tor running for now. Vidalia will not be able to\n"
" communicate with Tor until it is manually reconfigured - see\n"
@@ -61,16 +64,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Vidalia behöver kommunicera med den körande Tor-tjänsten så att den ett grafiskt användargränssnitt kan tillhandahållas. Detta kräver antingen manuell ändring av Tor för att tillåta säker autentisiering (rekomenderas) eller en omstart av Tor under Vidalias överinseende.\n"
-" * Ändra inte inställningar nu:\n"
-" låt Tor köra vidare nu. Vidalia kommer inte att kunna kommunicera\n"
-" med Tor förens manuell hantering av inställningarna är genomfört. Läs \n"
-" \"/usr/share/doc/vidalia/README.Debian\" för detaljer;\n"
-" * Starta om en gång:\n"
-" stoppa Tor nu så att Vidalia kan start det, men bara den här gången. Tor \n"
-" kommer att starta själv vid systemets uppstart. Manuell hantering av \n"
-" inställningar kommer att behövas.\n"
-" * Ta över permanent:\n"
-" stoppa Tor och låt Vidalia ta över uppstarten av Tor när du kör Vidalia\n"
-" (fungerar inte på fleranvändarsystem)."
-
diff --git a/experimental/po/templates.pot b/experimental/po/templates.pot
index 4ef8eb1..ab7ebb8 100644
--- a/experimental/po/templates.pot
+++ b/experimental/po/templates.pot
@@ -1,63 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Debconf translations for vidalia.
+# Copyright © 2011, Ulises Vitulli
+# This file is distributed under the same license as the vidalia package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 22:58-0300\n"
+"POT-Creation-Date: 2011-06-23 13:03-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "No Configuration"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "One-off restart"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "Permanent takeover"
-msgstr ""
-
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
-msgid "Tor/Vidalia interaction:"
+#: ../templates:1001
+msgid "Users to add to the debian-tor group:"
msgstr ""
-#. Type: select
+#. Type: multiselect
#. Description
-#: ../templates:1002
+#: ../templates:1001
msgid ""
-"Vidalia needs to communicate with the running Tor daemon so that it can "
-"provide a graphical user interface for it. This requires either the manual "
-"reconfiguration of Tor to allow secure authentication (recommended) or a "
-"restart of Tor under Vidalia's control.\n"
-" * No configuration:\n"
-" leave Tor running for now. Vidalia will not be able to\n"
-" communicate with Tor until it is manually reconfigured - see\n"
-" \"/usr/share/doc/vidalia/README.Debian\" for more details;\n"
-" * One-off restart:\n"
-" stop Tor now so Vidalia can start it, just this once - Tor will\n"
-" start by itself on reboots, so manual configuration will still\n"
-" be required;\n"
-" * Permanent takeover:\n"
-" stop Tor and simply let Vidalia handle starting it whenever you\n"
-" run Vidalia (not usable on a multi-user system)."
+"Users who should be able to control Tor daemon need to be added to the group "
+"\"debian-tor\"."
msgstr ""
diff --git a/experimental/po/vi.po b/experimental/po/vi.po
index 60b5247..7ebfdc5 100644
--- a/experimental/po/vi.po
+++ b/experimental/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vidalia 0.2.10-2\n"
"Report-Msgid-Bugs-To: vidalia at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-26 19:11-0300\n"
+"POT-Creation-Date: 2010-09-26 22:58-0300\n"
"PO-Revision-Date: 2010-09-28 19:17+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,33 +17,33 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.8\n"
-#: ../templates:1001
#. Type: select
#. Choices
+#: ../templates:1001
msgid "No Configuration"
-msgstr "Không có cấu hình"
+msgstr ""
-#: ../templates:1001
#. Type: select
#. Choices
+#: ../templates:1001
msgid "One-off restart"
-msgstr "Khởi chạy lại một lần"
+msgstr ""
-#: ../templates:1001
#. Type: select
#. Choices
+#: ../templates:1001
msgid "Permanent takeover"
-msgstr "Tiếp quản hẳn"
+msgstr ""
-#: ../templates:1002
#. Type: select
#. Description
+#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Tương tác Tor/Vidalia"
+msgstr ""
-#: ../templates:1002
#. Type: select
#. Description
+#: ../templates:1002
msgid ""
"Vidalia needs to communicate with the running Tor daemon so that it can "
"provide a graphical user interface for it. This requires either the manual "
@@ -60,14 +60,4 @@ msgid ""
" * Permanent takeover:\n"
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
-msgstr "Phần mềm Vidalia cần liên lạc với trình nền Tor đang chạy, để cung cấp một giao diện đồ họa cho nó. Trường hợp này cần thiết hoặc sự cấu hình lại Tor bằng tay để cho phép xác thức bảo mật (khuyến khích) hoặc sự khởi chạy lại Tor được Vidalia điều khiển.\n"
-" • Không có cấu hình\n"
-" Để lại Tor chạy tạm thời.\n"
-" Vidalia không liên lạc được với Tor trước khi nó được cấu hình lại bằng tay:\n"
-" xem tài liệu Đọc Đi « /usr/share/doc/vidalia/README.Debian » để tìm chi tiết.\n"
-" • Khởi chạy lại một lần\n"
-" Dừng chạy Tor ngay bây giờ đến khi nó được cấu hình lại bằng tay.\n"
-" Tor sẽ tự khởi chạy khi khởi động lại hệ thống thì vẫn còn cần cấu hình lại bằng tay.\n"
-" • Tiếp quản hẳn\n"
-" Dừng chạy Tor và đơn giản cho phép Vidalia quản lý việc khởi chạy nó\n"
-" khi nào bạn chạy Vidalia (không sử dụng được trên một hệ thống đa người dùng). "
+msgstr ""
diff --git a/experimental/po/zh_CN.po b/experimental/po/zh_CN.po
index cd637fa..077d95f 100644
--- a/experimental/po/zh_CN.po
+++ b/experimental/po/zh_CN.po
@@ -17,25 +17,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "不做任何配置"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "首次重新启动"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "改变启动方式"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Tor 和 Vidalia 如何交互:"
+msgstr ""
#. Type: select
#. Description
@@ -57,17 +57,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Tor 的图形化用户界面程序 Vidalia 需要和运行中的 Tor 程序进行交互。这就需要"
-"Tor 以安全认证的方式授权 Vidalia (推荐的方式)，或者由 Vidalia 重启 Tor 程"
-"序。\n"
-" * 不做任何配置:\n"
-" 维持当前运行的 Tor 程序不变，直到您手动调整了 Tor 配置文件以后 —— 查看\n"
-" \"/usr/share/doc/vidalia/README.Debian\" 获取更多相关信息；\n"
-" * 首次重新启动:\n"
-" 停止当前运行的 Tor 程序，直到您首次运行 Vidalia 时帮您重启 Tor 程序 ——\n"
-" 因为 Tor 程序在下次系统重启后会自动运行，所以您仍然需要手动调整 Tor 的\n"
-" 配置文件；\n"
-" * 改变启动方式:\n"
-" 停止当前运行的 Tor 程序，并且禁用 Tor 程序随系统开机自动运行，改成随\n"
-" Vidalia 程序启动时自动运行。(注意: 这种方式并不适合多用户使用的系统)。"
-
diff --git a/experimental/po/zh_TW.po b/experimental/po/zh_TW.po
index 13ba995..077d95f 100644
--- a/experimental/po/zh_TW.po
+++ b/experimental/po/zh_TW.po
@@ -17,25 +17,25 @@ msgstr ""
#. Choices
#: ../templates:1001
msgid "No Configuration"
-msgstr "不做任何配置"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "One-off restart"
-msgstr "首次重新啟動"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:1001
msgid "Permanent takeover"
-msgstr "改變啟動方式"
+msgstr ""
#. Type: select
#. Description
#: ../templates:1002
msgid "Tor/Vidalia interaction:"
-msgstr "Tor 和 Vidalia 如何交互:"
+msgstr ""
#. Type: select
#. Description
@@ -57,17 +57,3 @@ msgid ""
" stop Tor and simply let Vidalia handle starting it whenever you\n"
" run Vidalia (not usable on a multi-user system)."
msgstr ""
-"Tor 的圖形化用戶界面程序 Vidalia 需要和運行中的 Tor 程序進行交互。這就需要"
-"Tor 以安全認證的方式授權 Vidalia (推薦的方式)，或者由 Vidalia 重啟 Tor 程"
-"序。\n"
-" * 不做任何配置:\n"
-" 維持當前運行的 Tor 程序不變，直到您手動調整了 Tor 配置檔案以後 —— 查看\n"
-" \"/usr/share/doc/vidalia/README.Debian\" 獲取更多相關信息；\n"
-" * 首次重新啟動:\n"
-" 停止當前運行的 Tor 程序，直到您首次運行 Vidalia 時幫您重啟 Tor 程序 ——\n"
-" 因為 Tor 程序在下次系統重啟後會自動運行，所以您仍然需要手動調整 Tor 的\n"
-" 配置檔案；\n"
-" * 改變啟動方式:\n"
-" 停止當前運行的 Tor 程序，並且禁用 Tor 程序隨系統開機自動運行，改成隨\n"
-" Vidalia 程序啟動時自動運行。(注意: 這種方式並不適合多用戶使用的系統)。"
-
diff --git a/experimental/rules b/experimental/rules
index 1f9ac3a..a5649bb 100755
--- a/experimental/rules
+++ b/experimental/rules
@@ -27,7 +27,9 @@ configure-stamp:
dh_testdir
touch configure-stamp
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
diff --git a/experimental/templates b/experimental/templates
index 6e9b47a..de3ab6c 100644
--- a/experimental/templates
+++ b/experimental/templates
@@ -1,21 +1,6 @@
-Template: vidalia/tor-daemon-interaction
-Type: select
-Choices-C: nothing, one-off, permanent
-__Choices: No Configuration, One-off restart, Permanent takeover
-Default: permanent
-_Description: Tor/Vidalia interaction:
- Vidalia needs to communicate with the running Tor daemon so that it
- can provide a graphical user interface for it. This requires either
- the manual reconfiguration of Tor to allow secure authentication
- (recommended) or a restart of Tor under Vidalia's control.
- * No configuration:
- leave Tor running for now. Vidalia will not be able to
- communicate with Tor until it is manually reconfigured - see
- "/usr/share/doc/vidalia/README.Debian" for more details;
- * One-off restart:
- stop Tor now so Vidalia can start it, just this once - Tor will
- start by itself on reboots, so manual configuration will still
- be required;
- * Permanent takeover:
- stop Tor and simply let Vidalia handle starting it whenever you
- run Vidalia (not usable on a multi-user system).
+Template: vidalia/users
+Type: multiselect
+Choices: ${users}
+_Description: Users to add to the debian-tor group:
+ Users who should be able to control Tor daemon need to be added to the
+ group "debian-tor".
diff --git a/experimental/vidalia.install b/experimental/vidalia.install
index 4919049..081729d 100644
--- a/experimental/vidalia.install
+++ b/experimental/vidalia.install
@@ -1,4 +1,2 @@
debian/vidalia.xpm usr/share/pixmaps
debian/vidalia.desktop usr/share/applications
-debian/default.tor-on usr/share/vidalia
-debian/default.tor-off usr/share/vidalia
diff --git a/experimental/vidalia.lintian-overrides b/experimental/vidalia.lintian-overrides
deleted file mode 100644
index 7049838..0000000
--- a/experimental/vidalia.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-vidalia: unused-debconf-template
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list