[Pkg-privacy-commits] [vidalia] 01/03: Merge tag 'debian/0.2.21-3'

[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-3+tails1
in repository vidalia.

commit bbcbdf7b63deed2d25f166b2363fa3ed25495c88
Merge: 5d3334e 4617c34
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Apr 5 16:13:57 2014 +0000

    Merge tag 'debian/0.2.21-3'
    
    vidalia Debian release 0.2.21-3
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/NEWS                | 11 ++++++++++
 debian/apparmor-profile    |  5 +++++
 debian/changelog           | 50 +++++++++++++++++++++++++++++++++++++++++++---
 debian/control             | 12 +++++------
 debian/lintian-overrides   |  5 -----
 debian/po/{fi.po => ja.po} | 26 +++++++++++++-----------
 debian/po/{id.po => pl.po} | 28 +++++++++++++-------------
 debian/rules               |  5 +++--
 8 files changed, 100 insertions(+), 42 deletions(-)

diff --cc debian/changelog
index 3ae9ebd,f0f5940..fdcef67
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,33 +1,40 @@@
- vidalia (0.2.21-1+tails1) unstable; urgency=low
++vidalia (0.2.21-3+tails1) unstable; urgency=low
 +
 +  * NMU
 +  * Apply Tails-specific patches.
 +
 + -- Tails developers <tails at boum.org>  Mon, 28 Jan 2013 16:28:39 +0100
 +
+ vidalia (0.2.21-3) unstable; urgency=medium
+ 
+   * Disable miniupnpc support: it uses a very old embedded copy of that library.
+   * Remove spurious trailing whitespace in debian/rules.
+ 
+  -- intrigeri <intrigeri at debian.org>  Mon, 24 Feb 2014 11:48:47 +0100
+ 
+ vidalia (0.2.21-2) unstable; urgency=medium
+ 
+   * Import Japanese translation of debconf templates,
+     thanks to victory <victory.deb at gmail.com>. Closes: #718999.
+   * Import Polish translation of debconf templates,
+     thanks to Magdalena Zofia Kubot <magdalena.kubot at gmail.com>.
+     Closes: #731336.
+   * AppArmor profile improvements:
+     - allow reading same-owner /proc/PID/cmdline
+     - allow reading same-owner /proc/PID/fd/
+     - allow access to the session's D-Bus
+     - allow reading system-wide GTK themes (Closes: #682431)
+   * Don't version dependencies that are satisfied on oldstable (Squeeze).
+   * Use canonical URL for Vcs-*.
+   * Declare compatibility with standards version 3.9.5.
+   * Drop obsolete Lintian override.
+ 
+  -- intrigeri <intrigeri at debian.org>  Tue, 18 Feb 2014 10:19:08 +0100
+ 
  vidalia (0.2.21-1) unstable; urgency=low
  
-   * New upstream release, fixes several bugs:
+   [ Ulises Vitulli ]
+   * Un-hold locked 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
@@@ -17,16 -37,25 +44,33 @@@
      - 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
+   [ intrigeri ]
+   * Drop the patches that were taken from upstream 0.2.21:
+     - Fix-wrong-uptime-bandwidth-in-relay-list.patch
+     - Populate-the-relay-list-at-startup.patch
+ 
+  -- Ulises Vitulli <dererk at debian.org>  Sat, 11 May 2013 11:07:13 -0300
+ 
+ vidalia (0.2.20-2) unstable; urgency=low
+ 
+   * New patches cherry-picked from upstream 0.2.21:
+     - Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178)
+       This is upstream commit b3d4f7f with the changes/* file removed.
+     - Populate-the-relay-list-at-startup.patch (Closes: #699179)
+       This is taken from upstream commit b00f51dc, but with the fix for
+       upstream Trac#6482 (that doesn't seem worth a freeze exception) and
+       the changes/* file removed.
+ 
+  -- intrigeri <intrigeri at debian.org>  Sat, 02 Feb 2013 17:02:01 +0100
  
 +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 ]

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