[Pkg-privacy-commits] [torbrowser-launcher] 01/03: Merge tag 'debian/0.2.2-1' into debian/experimental

[Intrigeri]

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

intrigeri pushed a commit to branch debian/experimental
in repository torbrowser-launcher.

commit a4a986633fdb8e3256e0e0ece7f876956190b74f
Merge: 98f14fe 6690d09
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Nov 14 13:10:14 2015 +0000

    Merge tag 'debian/0.2.2-1' into debian/experimental
    
    released as 0.2.2-1 to experimental

 BUILD.md                                       |   4 +-
 CHANGELOG.md                                   |   8 +
 README.md                                      |  24 ++-
 apparmor/usr.bin.torbrowser-launcher           |   2 +-
 build_rpm.sh                                   |   2 +-
 debian/changelog                               |   8 +-
 screenshot.png                                 | Bin 104191 -> 155376 bytes
 share/applications/torbrowser-settings.desktop |   2 +-
 share/applications/torbrowser.desktop          |   2 +-
 share/torbrowser-launcher/version              |   2 +-
 stdeb.cfg                                      |   4 +-
 torbrowser_launcher/__init__.py                |   7 -
 torbrowser_launcher/common.py                  |  55 +------
 torbrowser_launcher/launcher.py                | 196 +++++++------------------
 torbrowser_launcher/settings.py                | 103 +++++++------
 15 files changed, 148 insertions(+), 271 deletions(-)

diff --cc debian/changelog
index 4c5f99b,48a95e8..debd2eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,9 +1,23 @@@
- torbrowser-launcher (0.2.1-2) UNRELEASED; urgency=medium
++torbrowser-launcher (0.2.2-2) UNRELEASED; urgency=medium
 +
 +  [ intrigeri ]
 +  * Re-apply changes from 0.2.0-2, that were dropped by the 0.2.1-1 upload.
 +  * Add debian/gbp.conf to automated selection of the packaging branch.
 +  * Drop AppArmor-allow-Tor-Browser-to-use-shared-libraries-s.patch:
 +    applied upstream.
 +  * Refresh patches.
 +
 +  [ Ximin Luo ]
 +  * hand over package to pkg-privacy team
 +
 + -- intrigeri <intrigeri at debian.org>  Sat, 14 Nov 2015 12:44:59 +0000
 +
+ torbrowser-launcher (0.2.2-1) experimental; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Holger Levsen <holger at debian.org>  Fri, 13 Nov 2015 18:50:18 +0100
+ 
  torbrowser-launcher (0.2.1-1) unstable; urgency=medium
  
    * New upstream version. (Closes: #804184, #804274, #804394)

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