[Pkg-privacy-commits] [vidalia] 86/160: Merge remote-tracking branch 'collab-maint/master'

[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 c11cd7984ea974e2d01ca13e89ba706f234b2793
Merge: f254ccf 6874041
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Nov 28 12:34:04 2011 +0100

    Merge remote-tracking branch 'collab-maint/master'
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 CHANGELOG                                 | 18 ++++++
 CMakeLists.txt                            |  2 +-
 changes/bug2188                           |  2 +
 changes/bug2644                           |  3 +
 changes/bug3342                           |  2 +
 changes/bug3759                           |  3 +
 changes/bug3843                           |  2 +
 changes/feat2163                          |  2 +
 debian/NEWS                               | 21 +++++++
 debian/README.Debian                      | 26 +++++++-
 debian/README.source                      | 12 ++++
 debian/changelog                          | 30 +++++++++-
 debian/config                             | 62 ++++++-------------
 debian/control                            |  4 +-
 debian/default.tor-off                    |  3 -
 debian/default.tor-on                     |  1 -
 debian/patches/series                     |  1 +
 debian/patches/use-control-socket.patch   | 22 +++++++
 debian/po/ca.po                           | 67 ++++-----------------
 debian/po/cs.po                           | 73 +++++------------------
 debian/po/da.po                           | 64 +++-----------------
 debian/po/de.po                           | 74 +++++------------------
 debian/po/es.po                           | 74 ++++-------------------
 debian/po/fi.po                           | 47 +++------------
 debian/po/fr.po                           | 73 +++++------------------
 debian/po/it.po                           | 64 +++-----------------
 debian/po/nl.po                           | 33 +++++++++++
 debian/po/pt.po                           | 77 ++++++------------------
 debian/po/ru.po                           | 75 +++++------------------
 debian/po/sv.po                           | 67 +++++----------------
 debian/po/templates.pot                   | 55 ++++-------------
 debian/po/vi.po                           | 62 ++++---------------
 debian/po/zh_CN.po                        | 68 ++++-----------------
 debian/po/zh_TW.po                        | 68 ++++-----------------
 debian/postinst                           | 25 ++++++++
 debian/templates                          | 27 ++-------
 debian/vidalia.install                    |  2 -
 debian/vidalia.lintian-overrides          |  1 -
 src/vidalia/CMakeLists.txt                |  6 ++
 src/vidalia/HelperProcess.cpp             | 17 ++++++
 src/vidalia/HelperProcess.h               |  2 +
 src/vidalia/MacOSXBundleInfo.plist.in     | 38 ++++++++++++
 src/vidalia/MainWindow.cpp                | 44 ++++++++++++--
 src/vidalia/bwgraph/GraphFrame.cpp        | 45 +++++++++++---
 src/vidalia/bwgraph/GraphFrame.h          |  4 ++
 src/vidalia/config/AdvancedPage.cpp       | 16 ++++-
 src/vidalia/config/AppearancePage.cpp     | 28 +++++++++
 src/vidalia/config/AppearancePage.ui      | 55 +++++++++++++++++
 src/vidalia/config/ServerPage.cpp         | 99 +++++++++++++++++++------------
 src/vidalia/config/ServerPage.ui          | 17 ++++--
 src/vidalia/config/ServerSettings.cpp     | 18 +++++-
 src/vidalia/config/ServerSettings.h       |  6 ++
 src/vidalia/config/VidaliaSettings.cpp    | 34 +++++++++++
 src/vidalia/config/VidaliaSettings.h      | 14 +++++
 src/vidalia/i18n/po/templates/vidalia.pot | 60 +++++++++----------
 src/vidalia/log/StatusEventItem.cpp       | 12 ++--
 src/vidalia/log/StatusEventItem.h         |  6 +-
 src/vidalia/log/StatusEventWidget.cpp     |  4 +-
 58 files changed, 838 insertions(+), 999 deletions(-)

diff --cc debian/changelog
index 7b5f740,eca490e..a1cd7e0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,29 +1,41 @@@
- vidalia (0.2.14-1+tails1) unstable; urgency=low
++vidalia (0.2.15-1+tails1) unstable; urgency=low
 +
 +  * NMU
 +  * Removed controls that are useless in Tails context.
 +  * Add -bridgeconf option. When enabled:
 +    - network settings are displayed on startup if needed
 +    - UseBridges is enabled
 +    - a Tails-specifig pop-up is shown.
-   * Refresh Quilt patches against new upstream release.
 +
 + -- intrigeri <intrigeri+debian at boum.org>  Tue, 30 Aug 2011 15:44:49 +0200
 +
+ vidalia (0.2.15-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Ulises Vitulli <dererk at debian.org>  Tue, 15 Nov 2011 17:14:07 -0300
+ 
+ vidalia (0.2.14-3) unstable; urgency=low
+ 
+   * Moved debconf actions from config to postinst script (Closes: #641044).
+   * Remove deprecated files that enforced Tor not to start after having
+     chosen to do so. This comes from the older approach to control Tor
+     (Closes: #642223).
+   * Added debconf templates translations:
+     - French, thanks Christian Perrier (Closes: #640769).
+     - German, thanks Martin.E.Schauer (Closes: #641920).
+ 
+  -- Ulises Vitulli <dererk at debian.org>  Mon, 19 Sep 2011 12:05:30 -0300
+ 
+ vidalia (0.2.14-2) unstable; urgency=low
+ 
+   * The 'Napoleon-Of-Crime' dupload.
+   * Tor's ControlSocket enabled version upload allowed to port exp 
+     changes to handle socket com out of the box (Closes: #640077).
+ 
+  -- Ulises Vitulli <dererk at debian.org>  Sat, 03 Sep 2011 15:47:23 -0300
++>>>>>>> collab-maint/master
+ 
  vidalia (0.2.14-1) unstable; urgency=low
  
    * The 'Monday-Rocking-Skiing' dupload.
diff --cc debian/patches/series
index 529aafe,a608de8..9e38729
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,2 +1,4 @@@
  debians-tor-binary-path.patch
 +vidalia-bridgeconf.patch
 +tails-remove-useless-controls.patch
+ use-control-socket.patch

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