[Pkg-privacy-commits] [torbrowser-launcher] 37/39: d/patches: Rebase patches

[Roger Shimizu]

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

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

commit 83c04dd58cd7c244d384b508394ebd1516b668f8
Author: Roger Shimizu <rosh at debian.org>
Date:   Tue Mar 27 22:24:52 2018 +0900

    d/patches: Rebase patches
---
 debian/changelog                                   | 20 +++++++++++++++++
 debian/patches/0001-Update-AppArmor-comments.patch | 25 ----------------------
 ...-Remove-apparmor-local-path-from-setup.py.patch |  4 ++--
 debian/patches/series                              |  1 -
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0477ef6..2687964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+torbrowser-launcher (0.3.0~dev-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.3.0.dev in develop branch
+    - Switch from python2 to python3
+    - Switch from gtk2 to Qt5 (Closes: #885489)
+    - Switch from twisted to requests/socks
+    - Use QThreads for async, and now download, verify, and extract
+      in separate threads too
+    - Remove modem sound
+    - Stopped refreshing the gpg keyring each time, and instead only
+      refresh it when you hit a verification error (and then try
+      verifying again before actually displaying the error)
+    - On verification error, it saves a copy of the tarball and sig
+      that failed to verify
+    - Improved python style with flake8
+  * debian/patches:
+    - Refresh patches.
+
+ -- Roger Shimizu <rosh at debian.org>  Tue, 27 Mar 2018 22:22:51 +0900
+
 torbrowser-launcher (0.2.9-2) unstable; urgency=medium
 
   * debian/patches:
diff --git a/debian/patches/0001-Update-AppArmor-comments.patch b/debian/patches/0001-Update-AppArmor-comments.patch
deleted file mode 100644
index a75de14..0000000
--- a/debian/patches/0001-Update-AppArmor-comments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Micah Lee <micah at micahflee.com>
-Date: Sun, 28 Jan 2018 11:19:20 -0800
-Subject: Update AppArmor comments
-
----
- apparmor/local/torbrowser.Browser.plugin-container | 2 +-
- apparmor/local/torbrowser.Tor.tor                  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/apparmor/local/torbrowser.Browser.plugin-container b/apparmor/local/torbrowser.Browser.plugin-container
-index da8acb0..39c9217 100644
---- a/apparmor/local/torbrowser.Browser.plugin-container
-+++ b/apparmor/local/torbrowser.Browser.plugin-container
-@@ -1,2 +1,2 @@
--# Site-specific additions and overrides for torbrowser.Browser.firefox.
-+# Site-specific additions and overrides for torbrowser.Browser.plugin-container.
- # For more details, please see /etc/apparmor.d/local/README.
-diff --git a/apparmor/local/torbrowser.Tor.tor b/apparmor/local/torbrowser.Tor.tor
-index da8acb0..8ba4033 100644
---- a/apparmor/local/torbrowser.Tor.tor
-+++ b/apparmor/local/torbrowser.Tor.tor
-@@ -1,2 +1,2 @@
--# Site-specific additions and overrides for torbrowser.Browser.firefox.
-+# Site-specific additions and overrides for torbrowser.Tor.tor.
- # For more details, please see /etc/apparmor.d/local/README.
diff --git a/debian/patches/0016-Remove-apparmor-local-path-from-setup.py.patch b/debian/patches/0016-Remove-apparmor-local-path-from-setup.py.patch
index 5e83b93..dc279a7 100644
--- a/debian/patches/0016-Remove-apparmor-local-path-from-setup.py.patch
+++ b/debian/patches/0016-Remove-apparmor-local-path-from-setup.py.patch
@@ -8,10 +8,10 @@ apparmor local files were just removed, so change setup.py accordingly.
  1 file changed, 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 991adbb..3185054 100644
+index 37452ba..cf098c1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -76,10 +76,6 @@ if distro != 'Ubuntu':
+@@ -83,10 +83,6 @@ if distro != 'Ubuntu':
                  'apparmor/torbrowser.Browser.firefox',
                  'apparmor/torbrowser.Browser.plugin-container',
                  'apparmor/torbrowser.Tor.tor']),
diff --git a/debian/patches/series b/debian/patches/series
index 51284dc..5c154ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Update-AppArmor-comments.patch
 0002-Drop-spurious-trailing-whitespace.patch
 0003-AppArmor-allow-plugin-container-to-read-file-app-ass.patch
 0004-AppArmor-allow-Firefox-to-ptrace-plugin-container-an.patch

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