[Pkg-privacy-commits] [torbrowser-launcher] 01/06: Merge tag 'debian/0.2.1-1' into debian/sid

[Intrigeri]

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

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

commit 97abc07682b38077b43f5b13234e9ca08c14f2b6
Merge: c5ec2f5 d930f56
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Nov 14 12:44:38 2015 +0000

    Merge tag 'debian/0.2.1-1' into debian/sid
    
    released as 0.2.1-1 to sid

 BUILD.md                                       |  4 +-
 CHANGELOG.md                                   |  8 +++
 README.md                                      |  6 +-
 apparmor/torbrowser.Browser.firefox            | 17 ++---
 apparmor/torbrowser.Tor.tor                    |  3 +-
 apparmor/torbrowser.start-tor-browser          | 53 ---------------
 apparmor/usr.bin.torbrowser-launcher           |  2 +-
 build_rpm.sh                                   |  2 +-
 debian/changelog                               |  6 ++
 setup.py                                       |  1 -
 share/applications/torbrowser-settings.desktop |  5 +-
 share/applications/torbrowser.desktop          |  5 +-
 share/torbrowser-launcher/erinn.asc            | 51 --------------
 share/torbrowser-launcher/version              |  2 +-
 stdeb.cfg                                      |  1 +
 torbrowser_launcher/common.py                  | 43 +++++-------
 torbrowser_launcher/launcher.py                | 93 ++++++++++++--------------
 17 files changed, 100 insertions(+), 202 deletions(-)

diff --cc debian/changelog
index 394cb2e,cd7df40..bc64462
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,9 +1,24 @@@
+ torbrowser-launcher (0.2.1-1) unstable; urgency=medium
+ 
+   * New upstream version. (Closes: #804184, #804274, #804394)
+ 
+  -- Holger Levsen <holger at debian.org>  Fri, 13 Nov 2015 18:41:38 +0100
+ 
 +torbrowser-launcher (0.2.0-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * AppArmor-allow-Tor-Browser-to-use-shared-libraries-s.patch: new patch,
 +    that extends the torbrowser.Browser.firefox AppArmor profile so that
 +    Tor Browser 4.5 and 5.0 can run.
 +  * debian/copyright: don't include the Expat license's text twice.
 +  * Include-local-overrides-file-in-AppArmor-profiles.-C.patch: new patch,
 +    to include local overrides file in AppArmor profiles. (Closes: #751451)
 +  * Set-torbrowser.start-tor-browser-and-usr.bin.torbrow.patch: new patch,
 +    that sets the torbrowser.start-tor-browser and usr.bin.torbrowser-launcher
 +    AppArmor profiles to complain mode.
 +
 + -- intrigeri <intrigeri at debian.org>  Wed, 12 Aug 2015 10:42:50 +0200
 +
  torbrowser-launcher (0.2.0-1) unstable; urgency=medium
   
    * New upstream version. (Closes: #784041)

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