[Pkg-privacy-commits] [vidalia] 55/160: Adding experimental pkgs, first step to out-of-the-box integration between Tor-Vidalia
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 8fa7ae843cd3380320376d9d697106ea0ee9371f
Author: Dererk <dererk at madap.com.ar>
Date: Thu Jun 23 12:48:04 2011 -0300
Adding experimental pkgs, first step to out-of-the-box integration between Tor-Vidalia
---
current/changelog | 3 +--
{current => experimental}/FAQ | 0
{current => experimental}/README.Debian | 0
{current => experimental}/changelog | 15 +++++++++++++++
{current => experimental}/compat | 0
{current => experimental}/config | 0
{current => experimental}/control | 2 +-
{current => experimental}/copyright | 0
{current => experimental}/default.tor-off | 0
{current => experimental}/default.tor-on | 0
{current => experimental}/docs | 0
{current => experimental}/menu | 0
.../patches/debians-tor-binary-path.patch | 0
{current => experimental}/patches/series | 1 +
experimental/patches/use-control-socket.patch | 22 ++++++++++++++++++++++
{current => experimental}/po/POTFILES.in | 0
{current => experimental}/po/ca.po | 0
{current => experimental}/po/cs.po | 0
{current => experimental}/po/da.po | 0
{current => experimental}/po/de.po | 0
{current => experimental}/po/es.po | 0
{current => experimental}/po/fi.po | 0
{current => experimental}/po/fr.po | 0
{current => experimental}/po/it.po | 0
{current => experimental}/po/pt.po | 0
{current => experimental}/po/ru.po | 0
{current => experimental}/po/sv.po | 0
{current => experimental}/po/templates.pot | 0
{current => experimental}/po/vi.po | 0
{current => experimental}/po/zh_CN.po | 0
{current => experimental}/po/zh_TW.po | 0
{current => experimental}/postinst | 0
{current => experimental}/postrm | 0
{current => experimental}/rules | 0
{current => experimental}/source/format | 0
{current => experimental}/templates | 0
{current => experimental}/vidalia.desktop | 0
{current => experimental}/vidalia.install | 0
.../vidalia.lintian-overrides | 0
{current => experimental}/vidalia.xpm | 0
{current => experimental}/watch | 0
41 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/current/changelog b/current/changelog
index 11b0d92..3b377ba 100644
--- a/current/changelog
+++ b/current/changelog
@@ -1,8 +1,7 @@
vidalia (0.2.12-2) unstable; urgency=low
* The 'It-is-a-nice-day-for-barbacue' dupload.
- * debian/config: Debconf kills Tor daemon while told not to
- (Closes: #623203).
+ * Debconf kills Tor daemon while told not to (Closes: #623203).
* Missing steps on CookieAuthentication/ControlPort documentation
(Closes: #623309).
diff --git a/current/FAQ b/experimental/FAQ
similarity index 100%
copy from current/FAQ
copy to experimental/FAQ
diff --git a/current/README.Debian b/experimental/README.Debian
similarity index 100%
copy from current/README.Debian
copy to experimental/README.Debian
diff --git a/current/changelog b/experimental/changelog
similarity index 94%
copy from current/changelog
copy to experimental/changelog
index 11b0d92..4a09a10 100644
--- a/current/changelog
+++ b/experimental/changelog
@@ -1,3 +1,18 @@
+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
+
+vidalia (0.3.0alpha-1) experimental; urgency=low
+
+ * The 'that-seems-nice!' dupload.
+ * Technology previewing 0.3.0 alpha release.
+
+ -- Ulises Vitulli <dererk at debian.org> Mon, 20 Jun 2011 14:01:45 -0300
+
vidalia (0.2.12-2) unstable; urgency=low
* The 'It-is-a-nice-day-for-barbacue' dupload.
diff --git a/current/compat b/experimental/compat
similarity index 100%
copy from current/compat
copy to experimental/compat
diff --git a/current/config b/experimental/config
similarity index 100%
copy from current/config
copy to experimental/config
diff --git a/current/control b/experimental/control
similarity index 97%
copy from current/control
copy to experimental/control
index 93d06b9..fc27492 100644
--- a/current/control
+++ b/experimental/control
@@ -12,7 +12,7 @@ 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
+Recommends: tor (>= 0.2.2.29-beta-1)
Suggests: iceweasel-torbutton
Description: controller GUI for Tor
Vidalia offers a graphical user interface to start and stop Tor, view
diff --git a/current/copyright b/experimental/copyright
similarity index 100%
copy from current/copyright
copy to experimental/copyright
diff --git a/current/default.tor-off b/experimental/default.tor-off
similarity index 100%
copy from current/default.tor-off
copy to experimental/default.tor-off
diff --git a/current/default.tor-on b/experimental/default.tor-on
similarity index 100%
copy from current/default.tor-on
copy to experimental/default.tor-on
diff --git a/current/docs b/experimental/docs
similarity index 100%
copy from current/docs
copy to experimental/docs
diff --git a/current/menu b/experimental/menu
similarity index 100%
copy from current/menu
copy to experimental/menu
diff --git a/current/patches/debians-tor-binary-path.patch b/experimental/patches/debians-tor-binary-path.patch
similarity index 100%
copy from current/patches/debians-tor-binary-path.patch
copy to experimental/patches/debians-tor-binary-path.patch
diff --git a/current/patches/series b/experimental/patches/series
similarity index 54%
copy from current/patches/series
copy to experimental/patches/series
index a8250ce..a608de8 100644
--- a/current/patches/series
+++ b/experimental/patches/series
@@ -1 +1,2 @@
debians-tor-binary-path.patch
+use-control-socket.patch
diff --git a/experimental/patches/use-control-socket.patch b/experimental/patches/use-control-socket.patch
new file mode 100644
index 0000000..5ace2be
--- /dev/null
+++ b/experimental/patches/use-control-socket.patch
@@ -0,0 +1,22 @@
+Author: dererk
+Description: Switch to Control Socket by default, this involves using Debian Tor from 0.2.2.29-beta or above
+--- old/src/vidalia/config/TorSettings.cpp 2011-06-23 11:03:12.809306636 -0300
++++ new/src/vidalia/config/TorSettings.cpp 2011-06-23 11:06:17.142220714 -0300
+@@ -48,7 +48,7 @@
+ /** Default to using hashed password authentication */
+ #define DEFAULT_AUTH_METHOD PasswordAuth
+ /** Default control method */
+-#define DEFAULT_CONTROL_METHOD "ControlPort"
++#define DEFAULT_CONTROL_METHOD "ControlSocket"
+ /** Default socket path */
+ #define DEFAULT_SOCKET_PATH ""
+
+@@ -84,7 +84,7 @@
+ setDefault(SETTING_CONTROL_PORT, 9051);
+ setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
+ setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
+- setDefault(SETTING_SOCKET_PATH, DEFAULT_SOCKET_PATH);
++ setDefault(SETTING_SOCKET_PATH, "/var/run/tor/control");
+ setDefault(SETTING_DATA_DIRECTORY, "");
+ setDefault(SETTING_CONTROL_PASSWORD, "");
+ setDefault(SETTING_USE_RANDOM_PASSWORD, true);
diff --git a/current/po/POTFILES.in b/experimental/po/POTFILES.in
similarity index 100%
copy from current/po/POTFILES.in
copy to experimental/po/POTFILES.in
diff --git a/current/po/ca.po b/experimental/po/ca.po
similarity index 100%
copy from current/po/ca.po
copy to experimental/po/ca.po
diff --git a/current/po/cs.po b/experimental/po/cs.po
similarity index 100%
copy from current/po/cs.po
copy to experimental/po/cs.po
diff --git a/current/po/da.po b/experimental/po/da.po
similarity index 100%
copy from current/po/da.po
copy to experimental/po/da.po
diff --git a/current/po/de.po b/experimental/po/de.po
similarity index 100%
copy from current/po/de.po
copy to experimental/po/de.po
diff --git a/current/po/es.po b/experimental/po/es.po
similarity index 100%
copy from current/po/es.po
copy to experimental/po/es.po
diff --git a/current/po/fi.po b/experimental/po/fi.po
similarity index 100%
copy from current/po/fi.po
copy to experimental/po/fi.po
diff --git a/current/po/fr.po b/experimental/po/fr.po
similarity index 100%
copy from current/po/fr.po
copy to experimental/po/fr.po
diff --git a/current/po/it.po b/experimental/po/it.po
similarity index 100%
copy from current/po/it.po
copy to experimental/po/it.po
diff --git a/current/po/pt.po b/experimental/po/pt.po
similarity index 100%
copy from current/po/pt.po
copy to experimental/po/pt.po
diff --git a/current/po/ru.po b/experimental/po/ru.po
similarity index 100%
copy from current/po/ru.po
copy to experimental/po/ru.po
diff --git a/current/po/sv.po b/experimental/po/sv.po
similarity index 100%
copy from current/po/sv.po
copy to experimental/po/sv.po
diff --git a/current/po/templates.pot b/experimental/po/templates.pot
similarity index 100%
copy from current/po/templates.pot
copy to experimental/po/templates.pot
diff --git a/current/po/vi.po b/experimental/po/vi.po
similarity index 100%
copy from current/po/vi.po
copy to experimental/po/vi.po
diff --git a/current/po/zh_CN.po b/experimental/po/zh_CN.po
similarity index 100%
copy from current/po/zh_CN.po
copy to experimental/po/zh_CN.po
diff --git a/current/po/zh_TW.po b/experimental/po/zh_TW.po
similarity index 100%
copy from current/po/zh_TW.po
copy to experimental/po/zh_TW.po
diff --git a/current/postinst b/experimental/postinst
similarity index 100%
copy from current/postinst
copy to experimental/postinst
diff --git a/current/postrm b/experimental/postrm
similarity index 100%
copy from current/postrm
copy to experimental/postrm
diff --git a/current/rules b/experimental/rules
similarity index 100%
copy from current/rules
copy to experimental/rules
diff --git a/current/source/format b/experimental/source/format
similarity index 100%
copy from current/source/format
copy to experimental/source/format
diff --git a/current/templates b/experimental/templates
similarity index 100%
copy from current/templates
copy to experimental/templates
diff --git a/current/vidalia.desktop b/experimental/vidalia.desktop
similarity index 100%
copy from current/vidalia.desktop
copy to experimental/vidalia.desktop
diff --git a/current/vidalia.install b/experimental/vidalia.install
similarity index 100%
copy from current/vidalia.install
copy to experimental/vidalia.install
diff --git a/current/vidalia.lintian-overrides b/experimental/vidalia.lintian-overrides
similarity index 100%
copy from current/vidalia.lintian-overrides
copy to experimental/vidalia.lintian-overrides
diff --git a/current/vidalia.xpm b/experimental/vidalia.xpm
similarity index 100%
copy from current/vidalia.xpm
copy to experimental/vidalia.xpm
diff --git a/current/watch b/experimental/watch
similarity index 100%
copy from current/watch
copy to experimental/watch
--
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