[Pkg-privacy-commits] [vidalia] 76/160: Refresh Quilt patches against new upstream release.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:32 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 1eb709067ee59cf7467d6859ef1bc4294a442a05
Author: intrigeri <intrigeri at boum.org>
Date: Tue Aug 30 15:47:37 2011 +0200
Refresh Quilt patches against new upstream release.
---
debian/patches/debians-tor-binary-path.patch | 8 +++--
debian/patches/tails-remove-useless-controls.patch | 24 ++++++-------
debian/patches/vidalia-bridgeconf.patch | 40 +++++++++++-----------
3 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/debian/patches/debians-tor-binary-path.patch b/debian/patches/debians-tor-binary-path.patch
index f12f55c..3455c11 100644
--- a/debian/patches/debians-tor-binary-path.patch
+++ b/debian/patches/debians-tor-binary-path.patch
@@ -1,8 +1,10 @@
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.
---- old/src/vidalia/config/TorSettings.cpp 2009-01-14 13:56:54.000000000 -0200
-+++ new/src/vidalia/config/TorSettings.cpp 2010-01-23 06:02:41.930010310 -0300
-@@ -68,7 +68,8 @@
+Index: git/src/vidalia/config/TorSettings.cpp
+===================================================================
+--- git.orig/src/vidalia/config/TorSettings.cpp 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/config/TorSettings.cpp 2011-08-30 15:46:35.494994101 +0200
+@@ -76,7 +76,8 @@
else
setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
#else
diff --git a/debian/patches/tails-remove-useless-controls.patch b/debian/patches/tails-remove-useless-controls.patch
index 14f0692..31fd32a 100644
--- a/debian/patches/tails-remove-useless-controls.patch
+++ b/debian/patches/tails-remove-useless-controls.patch
@@ -1,7 +1,7 @@
-Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
+Index: git/src/vidalia/MainWindow.cpp
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/MainWindow.cpp 2011-04-22 12:23:01.040851642 +0200
-+++ vidalia-0.2.12/src/vidalia/MainWindow.cpp 2011-04-22 12:26:11.577646997 +0200
+--- git.orig/src/vidalia/MainWindow.cpp 2011-08-30 15:46:46.291104580 +0200
++++ git/src/vidalia/MainWindow.cpp 2011-08-30 15:46:52.247165530 +0200
@@ -211,8 +211,7 @@
this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
@@ -81,7 +81,7 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
torMenu->addAction(_actionNewIdentity);
QMenu *viewMenu = _menuBar->addMenu(tr("View"));
-@@ -877,20 +856,7 @@
+@@ -872,20 +851,7 @@
actionText = tr("Start Tor");
trayIconFile = IMG_TOR_STOPPED;
statusIconFile = IMG_TOR_STOPPED_48;
@@ -103,7 +103,7 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
setStartupProgressVisible(false);
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
-@@ -901,32 +867,10 @@
+@@ -896,32 +862,10 @@
}
trayIconFile = IMG_TOR_STOPPING;
statusIconFile = IMG_TOR_STOPPING_48;
@@ -136,11 +136,11 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
setStartupProgressVisible(true);
setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
} else if (status == CircuitEstablished) {
-Index: vidalia-0.2.12/src/vidalia/MainWindow.h
+Index: git/src/vidalia/MainWindow.h
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/MainWindow.h 2011-04-22 12:23:01.040851642 +0200
-+++ vidalia-0.2.12/src/vidalia/MainWindow.h 2011-04-22 12:26:11.577646997 +0200
-@@ -277,7 +277,6 @@
+--- git.orig/src/vidalia/MainWindow.h 2011-08-30 15:46:46.291104580 +0200
++++ git/src/vidalia/MainWindow.h 2011-08-30 15:46:52.247165530 +0200
+@@ -280,7 +280,6 @@
/** Defines the actions for the tray menu */
QAction* _actionShowControlPanel;
@@ -148,10 +148,10 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.h
QAction* _actionShowConfig;
QAction* _actionShowAbout;
QAction* _actionExit;
-Index: vidalia-0.2.12/src/vidalia/MainWindow.ui
+Index: git/src/vidalia/MainWindow.ui
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/MainWindow.ui 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/MainWindow.ui 2011-04-22 12:26:11.577646997 +0200
+--- git.orig/src/vidalia/MainWindow.ui 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/MainWindow.ui 2011-08-30 15:46:52.247165530 +0200
@@ -224,32 +224,6 @@
<property name="spacing" >
<number>6</number>
diff --git a/debian/patches/vidalia-bridgeconf.patch b/debian/patches/vidalia-bridgeconf.patch
index bf6ae11..3c1853b 100644
--- a/debian/patches/vidalia-bridgeconf.patch
+++ b/debian/patches/vidalia-bridgeconf.patch
@@ -1,7 +1,7 @@
-Index: vidalia-0.2.12/src/vidalia/config/NetworkSettings.cpp
+Index: git/src/vidalia/config/NetworkSettings.cpp
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/config/NetworkSettings.cpp 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/config/NetworkSettings.cpp 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/config/NetworkSettings.cpp 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/config/NetworkSettings.cpp 2011-08-30 15:46:46.291104580 +0200
@@ -16,6 +16,8 @@
#include "NetworkSettings.h"
#include "TorControl.h"
@@ -33,10 +33,10 @@ Index: vidalia-0.2.12/src/vidalia/config/NetworkSettings.cpp
/** Converts the ProxyType <b>type</b> to a string to store in the
* configuration file. */
QString
-Index: vidalia-0.2.12/src/vidalia/config/NetworkSettings.h
+Index: git/src/vidalia/config/NetworkSettings.h
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/config/NetworkSettings.h 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/config/NetworkSettings.h 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/config/NetworkSettings.h 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/config/NetworkSettings.h 2011-08-30 15:46:46.291104580 +0200
@@ -98,6 +98,9 @@
* connections through a one-hop circuit. */
bool getTunnelDirConns();
@@ -47,10 +47,10 @@ Index: vidalia-0.2.12/src/vidalia/config/NetworkSettings.h
private:
/** Converts the ProxyType <b>type</b> to a string to store in the
* configuration file. */
-Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
+Index: git/src/vidalia/MainWindow.cpp
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/MainWindow.cpp 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/MainWindow.cpp 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/MainWindow.cpp 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/MainWindow.cpp 2011-08-30 15:46:46.291104580 +0200
@@ -23,6 +23,7 @@
#include "ControlPasswordInputDialog.h"
#include "TorSettings.h"
@@ -59,7 +59,7 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
-@@ -1400,6 +1401,20 @@
+@@ -1456,6 +1457,20 @@
if (status.isValid())
bootstrapStatusChanged(status);
}
@@ -80,7 +80,7 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
}
/** Called when Vidalia fails to authenticate to Tor. The failure reason is
-@@ -1747,6 +1762,37 @@
+@@ -1803,6 +1818,37 @@
showConfigDialog(ConfigDialog::Server);
}
@@ -118,10 +118,10 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.cpp
/** Called when the user selects the "New Identity" action from the menu. */
void
MainWindow::newIdentity()
-Index: vidalia-0.2.12/src/vidalia/MainWindow.h
+Index: git/src/vidalia/MainWindow.h
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/MainWindow.h 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/MainWindow.h 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/MainWindow.h 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/MainWindow.h 2011-08-30 15:46:46.291104580 +0200
@@ -114,6 +114,8 @@
void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
/** Displays the Configuration dialog, set to the Server page. */
@@ -131,10 +131,10 @@ Index: vidalia-0.2.12/src/vidalia/MainWindow.h
/** Called when the "show on startup" checkbox is toggled. */
void toggleShowOnStartup(bool checked);
/** Called when the web browser or IM client have stopped */
-Index: vidalia-0.2.12/src/vidalia/Vidalia.cpp
+Index: git/src/vidalia/Vidalia.cpp
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/Vidalia.cpp 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/Vidalia.cpp 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/Vidalia.cpp 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/Vidalia.cpp 2011-08-30 15:46:46.295104621 +0200
@@ -40,14 +40,15 @@
#include <stdlib.h>
@@ -188,10 +188,10 @@ Index: vidalia-0.2.12/src/vidalia/Vidalia.cpp
out << "</table>";
VMessageBox::information(0,
-Index: vidalia-0.2.12/src/vidalia/Vidalia.h
+Index: git/src/vidalia/Vidalia.h
===================================================================
---- vidalia-0.2.12.orig/src/vidalia/Vidalia.h 2011-04-11 00:49:02.000000000 +0200
-+++ vidalia-0.2.12/src/vidalia/Vidalia.h 2011-04-22 12:23:01.040851642 +0200
+--- git.orig/src/vidalia/Vidalia.h 2011-08-30 15:44:10.457509573 +0200
++++ git/src/vidalia/Vidalia.h 2011-08-30 15:46:46.295104621 +0200
@@ -74,6 +74,10 @@
/** Returns Vidalia's main TorControl object. */
--
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