[Pkg-privacy-commits] [vidalia] 06/07: Merge commit '12ed2152cd03d64d6a73d1d7f55d749b5cbea6ae'

[Ximin Luo]

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

infinity0 pushed a commit to annotated tag debian/0.2.21-1+tails1
in repository vidalia.

commit 45462a0e88a8d978a5308062074f199b104effbe
Merge: 3328ed0 12ed215
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Jan 28 16:27:50 2013 +0100

    Merge commit '12ed2152cd03d64d6a73d1d7f55d749b5cbea6ae'
    
    Conflicts:
    	debian/changelog
    	debian/control

 CHANGELOG                                          |   10 +
 CMakeLists.txt                                     |    2 +-
 debian/changelog                                   |   14 +
 debian/control                                     |    2 +-
 debian/po/it.po                                    |   94 +-
 src/torcontrol/RouterDescriptor.cpp                |    7 +-
 src/vidalia/MainWindow.cpp                         |   15 +-
 src/vidalia/i18n/po/bg/vidalia_bg.po               |   57 +-
 src/vidalia/i18n/po/cs/vidalia_cs.po               |  109 +-
 src/vidalia/i18n/po/el/vidalia_el.po               |   27 +-
 src/vidalia/i18n/po/fr/vidalia_fr.po               |   23 +-
 src/vidalia/i18n/po/he/vidalia_he.po               |  966 +++++-----
 src/vidalia/i18n/po/id/vidalia_id.po               |   25 +-
 src/vidalia/i18n/po/it/vidalia_it.po               |  111 +-
 src/vidalia/i18n/po/ja/vidalia_ja.po               |  418 ++---
 src/vidalia/i18n/po/ko/qt_ko.po                    |   13 +-
 src/vidalia/i18n/po/ko/vidalia_ko.po               |  110 +-
 .../i18n/po/{ko/qt_ko.po => ko_KR/qt_ko_KR.po}     |   93 +-
 src/vidalia/i18n/po/lt/qt_lt.po                    |  171 +-
 src/vidalia/i18n/po/lv/qt_lv.po                    |  173 +-
 src/vidalia/i18n/po/lv/vidalia_lv.po               | 1904 ++++++++++----------
 src/vidalia/i18n/po/my/vidalia_my.po               | 1216 ++++++-------
 src/vidalia/i18n/po/nl/qt_nl.po                    |   31 +-
 src/vidalia/i18n/po/nl/vidalia_nl.po               |   11 +-
 src/vidalia/i18n/po/pt/vidalia_pt.po               |  109 +-
 src/vidalia/i18n/po/ro/vidalia_ro.po               |  121 +-
 src/vidalia/i18n/po/ru/vidalia_ru.po               |   37 +-
 src/vidalia/i18n/po/templates/qt.pot               |   26 +-
 src/vidalia/i18n/po/templates/vidalia.pot          |  452 +++--
 src/vidalia/i18n/po/tr/vidalia_tr.po               |   19 +-
 src/vidalia/i18n/po/zh_CN/qt_zh_CN.po              |   11 +-
 src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po         |  248 +--
 src/vidalia/network/NetViewer.cpp                  |    7 +
 src/vidalia/network/RouterDescriptorView.cpp       |    8 +-
 34 files changed, 3419 insertions(+), 3221 deletions(-)

diff --cc debian/changelog
index dd33396,52b877b..51fd489
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,25 @@@
+ vidalia (0.2.21-1) unstable; urgency=low
+ 
+   * New upstream release, fixes several bugs:
+     - Avoid waiting to reload router list if ns/all returned empty.
+     - Stop trying to load router information if torControl is not connected.
+     - Fix RouterDescriptor's bandwidth and uptime values when defined from the
+       consensus.
+     - Save ControlPortWriteToFile using relative path.
+   * Updated Debconf template translations:
+     - Italian, thanks Fabio Pirola (Closes: #699082).
+   * Updated Standard-version to 3.9.4 (no changes needed).
+ 
+  -- Ulises Vitulli <dererk at debian.org>  Sun, 27 Jan 2013 10:27:17 -0300
+ 
 +vidalia (0.2.20-1+tails1) unstable; urgency=low
 +
 +  * NMU
 +  * Refresh Tails-specific patches so that they apply against Vidalia 0.2.20.
 +  * Disable AppArmor support from Debian packaging.
 +
 + -- Tails developers <tails at boum.org>  Tue, 04 Sep 2012 17:02:29 +0200
 +
  vidalia (0.2.20-1) unstable; urgency=low
  
    [ Ulises Vitulli ]
diff --cc debian/control
index 07df443,5e52918..85e5eae
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: ne
  Priority: extra
  Maintainer: Ulises Vitulli <dererk at debian.org>
  Uploaders: Vern Sun <s5unty at gmail.com>, intrigeri <intrigeri at debian.org>
 -Build-Depends: debhelper (>= 6.0.7~), dh-apparmor, autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g), dpkg-dev (>= 1.16.1.1~)
 +Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g), dpkg-dev (>= 1.16.1.1~)
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.4
  Homepage: https://www.torproject.org/projects/vidalia
  Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
  Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git

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