[Pkg-privacy-commits] [vidalia] 120/160: New upstream release 0.2.20, candidate for #1 tentative freeze exception. We'll wait a 10-day period for bug hunting and QA, and see if no new bugs/patches are produced here on upstream side.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit 84b1e18ae40fb0ae1970d7ce704fd9ef71f0f2e5
Author: Dererk <dererk at debian.org>
Date:   Fri Jul 13 20:47:25 2012 -0300

    New upstream release 0.2.20, candidate for #1 tentative freeze
    exception. We'll wait a 10-day period for bug hunting and QA, and see if
    no new bugs/patches are produced here on upstream side.
---
 debian/changelog                                   | 14 ++++++++++
 ...er-status-information-if-Tor-is-using-mic.patch | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fc2d8a..b0cec67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vidalia (0.2.20-1) unstable; urgency=low
+
+  * New upstream release, fixes several bugs:
+    - Append router status information if Tor is using microdescriptors, this
+      bug produced empty nodes lists and their interactions (Closes: #680489).
+    - Display paths with their native separators. Resolves ticket #4337.
+    - Do not ignore the Show on Startup checkbox. Fixes bug #5351.
+    - Do not add relative root to DataDirectory if it is empty. 
+      Fixes bug #6178.
+  * Remove local patch Append-router-status-information-if-Tor-is-using-mic,
+    fixed on upstream.
+
+ -- Ulises Vitulli <dererk at debian.org>  Fri, 13 Jul 2012 20:20:45 -0300
+
 vidalia (0.2.19-2) unstable; urgency=low
 
   * Moved apparmor from runtime dep to a suggested one (Closes: #678549).
diff --git a/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch b/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch
deleted file mode 100644
index a803382..0000000
--- a/debian/patches/Append-router-status-information-if-Tor-is-using-mic.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Tomás Touceda <chiiph at torproject.org>
-Subject: Append router status information if Tor is using microdescriptors
-Last-Update: Fri, 6 Jul 2012 17:55:29 -0300
-Applied-Upstream: 579b685ed19957d63989c0bf3a35b8f228f5e052
-
----
- src/vidalia/network/NetViewer.cpp |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
-index 535c127..1d48b96 100644
---- a/src/vidalia/network/NetViewer.cpp
-+++ b/src/vidalia/network/NetViewer.cpp
-@@ -313,11 +313,16 @@ NetViewer::loadNetworkStatus()
- {
-   NetworkStatus networkStatus = _torControl->getNetworkStatus();
- 
-+  bool usingMicrodescriptors = _torControl->useMicrodescriptors();
-+
-   foreach(RouterStatus rs, networkStatus) {
-     if (!rs.isRunning())
-       continue;
- 
-     RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id());
-+    if(usingMicrodescriptors) {
-+      rd.appendRouterStatusInfo(rs);
-+    }
-     if (!rd.isEmpty())
-       addRouter(rd);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9d09ce1..a608de8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debians-tor-binary-path.patch
 use-control-socket.patch
-Append-router-status-information-if-Tor-is-using-mic.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git