[Pkg-privacy-commits] [vidalia] 12/26: Debian experimental 0.3.3~alpha-1 upload and pool party \o/

[Ximin Luo]

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

infinity0 pushed a commit to branch experimental
in repository vidalia.

commit ebab435180062358b7326a54f1e640f62b55b3cd
Author: Dererk <dererk at debian.org>
Date:   Thu Jul 12 01:32:16 2012 -0300

    Debian experimental 0.3.3~alpha-1 upload and pool party \o/
---
 debian/changelog                             | 12 +++++++-----
 debian/patches/debians-tor-binary-path.patch |  6 +++---
 debian/patches/use-control-socket.patch      | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abc5bd5..ddb3d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
-vidalia (0.3.1-2~1.gbp7c7350) UNRELEASED; urgency=low
+vidalia (0.3.3~alpha-1) experimental; urgency=low
 
-  ** SNAPSHOT build @7c73500cceeacc6c5878261431f24759b51eb0c7 **
-
-  [ Dererk ]
+  [ Ulises Vitulli ]
+  * New alpha upstream release:
+    - Fix FTBFS: error: '::sleep' has not been declared (Closes: #676865).
+    - Implemented SafeCookie authen method (not used on Debian by default).
   * Remove missintended NEWS block for 0.2.17, instead 0.3.1.
+  * Cleanly refresh local patches.
 
   [ intrigeri ]
   * Install AppArmor profile.
   * Enable hardening flags.
 
- -- Dererk <dererk at debian.org>  Sun, 10 Jun 2012 18:53:20 +0200
+ -- Ulises Vitulli <dererk at debian.org>  Sun, 10 Jun 2012 18:53:20 +0200
 
 vidalia (0.3.1-1) experimental; urgency=low
 
diff --git a/debian/patches/debians-tor-binary-path.patch b/debian/patches/debians-tor-binary-path.patch
index 660d528..6f5a0e9 100644
--- a/debian/patches/debians-tor-binary-path.patch
+++ b/debian/patches/debians-tor-binary-path.patch
@@ -2,9 +2,9 @@ Author: dererk
 Description: Even though upstream has implemented a block of code to perform this check, as Tor's binary is located in /usr/sbin path, regular users are likely to lack that path in their PATH enviroment variable. This patch purpose is setting it to the right Debian's Tor package.
 Index: git/src/vidalia/config/TorSettings.cpp
 ===================================================================
---- git.orig/src/vidalia/config/TorSettings.cpp	2012-03-07 11:13:33.000000000 -0300
-+++ git/src/vidalia/config/TorSettings.cpp	2012-03-07 11:23:57.000000000 -0300
-@@ -77,7 +77,8 @@
+--- git.orig/src/vidalia/config/TorSettings.cpp	2012-07-12 01:21:46.000000000 -0300
++++ git/src/vidalia/config/TorSettings.cpp	2012-07-12 01:22:54.000000000 -0300
+@@ -83,7 +83,8 @@
    else
      setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
  #else
diff --git a/debian/patches/use-control-socket.patch b/debian/patches/use-control-socket.patch
index eab5ac4..0f1515c 100644
--- a/debian/patches/use-control-socket.patch
+++ b/debian/patches/use-control-socket.patch
@@ -2,9 +2,9 @@ Author: dererk
 Description: Switch to Control Socket by default, this involves using Debian Tor from 0.2.2.29-beta or above
 Index: git/src/vidalia/config/TorSettings.cpp
 ===================================================================
---- git.orig/src/vidalia/config/TorSettings.cpp	2012-02-11 22:21:38.000000000 -0300
-+++ git/src/vidalia/config/TorSettings.cpp	2012-02-11 22:21:38.000000000 -0300
-@@ -49,7 +49,7 @@
+--- git.orig/src/vidalia/config/TorSettings.cpp	2012-07-12 01:22:44.000000000 -0300
++++ git/src/vidalia/config/TorSettings.cpp	2012-07-12 01:22:44.000000000 -0300
+@@ -54,7 +54,7 @@
  /** Default to using hashed password authentication */
  #define DEFAULT_AUTH_METHOD     PasswordAuth
  /** Default control method */
@@ -13,8 +13,8 @@ Index: git/src/vidalia/config/TorSettings.cpp
  /** Default socket path */
  #define DEFAULT_SOCKET_PATH  ""
  
-@@ -86,7 +86,7 @@
-   setDefault(SETTING_CONTROL_PORT,  9051);
+@@ -94,7 +94,7 @@
+   setDefault(SETTING_SOCKS_PORT,  9050);
    setDefault(SETTING_AUTH_METHOD,   toString(DEFAULT_AUTH_METHOD));
    setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
 -  setDefault(SETTING_SOCKET_PATH, DEFAULT_SOCKET_PATH);

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