[Pkg-privacy-commits] [torbrowser-launcher] 04/06: Merge tag 'debian/0.2.6-3.1' into debian/sid

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit c001481b17efa7c62851d527971c85bb8aad5d7f
Merge: aa96a90 5d9ef50
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed May 3 12:11:32 2017 +0200

    Merge tag 'debian/0.2.6-3.1' into debian/sid
    
    This is the NMU made by Ian R. Learmont, unfortunately
    no changes were recorded in Git, which would have sim-
    plified my life a lot. Adding this information now, so
    that it does not get lost.
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                            |   8 +
 debian/patches/series                       |   3 +
 debian/patches/update-tor-signing-key.patch | 352 ++++++++++++++++++++++++++++
 3 files changed, 363 insertions(+)

diff --cc debian/changelog
index 235ccbe,69cc3a3..d1232a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,27 @@@
 +torbrowser-launcher (0.2.7-1) unstable; urgency=medium
 +
 +  * New upstream version.
 +    - Updated Tor Browser signing key because they added a new
 +      subkey and verification was failing.
 +    - Updated AppArmor profile (Closes: #852732).
 +    - Improved localization. Added Russian.
 +  * debian/patches:
 +    - Delete cherry-picked AppArmor patches.
 +  * debian/rules:
 +    - Clean binary mo files.
 +  * debian/copyright:
 +    - Bump years.
 +
 + -- Ulrike Uhlig <u at 451f.org>  Wed, 19 Apr 2017 18:30:32 +0200
 +
+ torbrowser-launcher (0.2.6-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+     * debian/patches/update-tor-signing-key.patch:
+    - Updates the signing key to include the new subkey. (Closes: #852732)
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Tue, 07 Mar 2017 23:18:36 +0000
+ 
  torbrowser-launcher (0.2.6-3) unstable; urgency=medium
  
    * Team upload.

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