[Pkg-privacy-commits] [torbrowser-launcher] 01/01: d/patches: Add a local patch to fix FTBFS

[Roger Shimizu]

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

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

commit ae0070a24e20f225f96d81cf42192dde8b8ee8ad
Author: Roger Shimizu <rosh at debian.org>
Date:   Sun Mar 18 23:12:53 2018 +0900

    d/patches: Add a local patch to fix FTBFS
    
    Remove apparmor local path from setup.py
---
 debian/changelog                                   |  2 ++
 ...-Remove-apparmor-local-path-from-setup.py.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b20f608..dd284dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ torbrowser-launcher (0.2.9-2) UNRELEASED; urgency=medium
       + Silencing all the denial logs I could observe
       + Support for obfs4 and obfs3
       + Various updates, refactoring and clean-ups
+    - Add a local patch to fix FTBFS:
+      Remove apparmor local path from setup.py
 
  -- Roger Shimizu <rosh at debian.org>  Sun, 18 Mar 2018 22:39:20 +0900
 
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
new file mode 100644
index 0000000..5e83b93
--- /dev/null
+++ b/debian/patches/0016-Remove-apparmor-local-path-from-setup.py.patch
@@ -0,0 +1,24 @@
+From: Roger Shimizu <rosh at debian.org>
+Date: Sun, 18 Mar 2018 23:12:26 +0900
+Subject: Remove apparmor local path from setup.py
+
+apparmor local files were just removed, so change setup.py accordingly.
+---
+ setup.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 991adbb..3185054 100644
+--- a/setup.py
++++ b/setup.py
+@@ -76,10 +76,6 @@ if distro != 'Ubuntu':
+                 'apparmor/torbrowser.Browser.firefox',
+                 'apparmor/torbrowser.Browser.plugin-container',
+                 'apparmor/torbrowser.Tor.tor']),
+-            ('/etc/apparmor.d/local/', [
+-                'apparmor/local/torbrowser.Browser.firefox',
+-                'apparmor/local/torbrowser.Browser.plugin-container',
+-                'apparmor/local/torbrowser.Tor.tor']),
+             ('/etc/apparmor.d/tunables/', ['apparmor/tunables/torbrowser'])
+         ]
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e98eadd..51284dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0013-AppArmor-give-the-tor-profile-a-stable-name.patch
 0014-AppArmor-support-some-of-the-included-pluggable-tran.patch
 0015-AppArmor-remove-boilerplate-from-local-override-file.patch
+0016-Remove-apparmor-local-path-from-setup.py.patch

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