[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] d/patches: Cherry-pick a patch to fix FTBFS issue

[Roger Shimizu]

Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher


Commits:
fffb55b3 by Roger Shimizu at 2019-11-20T16:49:28Z
d/patches: Cherry-pick a patch to fix FTBFS issue

https://github.com/micahflee/torbrowser-launcher/pull/444

This also introduces another change:
  debian/control: Add python3-distro to Build-Depends.

Thanks to Carl Joseph Hirner III.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0015-Update-setup.py.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -9,6 +9,9 @@ torbrowser-launcher (0.3.2-3) UNRELEASED; urgency=medium
       + [0b78aea] AppArmor: allow new path for the Firefox 68 IPC
       + [73fc84b] AppArmor: Pass the environment to Firefox content processes
       + [b8a13f9] AppArmor: allow running the Firefox updater from its new path
+    - Cherry-pick a patch from upstream pull-request queue to fix FTBFS issue.
+      Thanks to Carl Joseph Hirner III.
+  * debian/control: Add python3-distro to Build-Depends.
 
  -- Roger Shimizu <rosh at debian.org>  Thu, 21 Nov 2019 00:27:42 +0900
 


=====================================
debian/control
=====================================
@@ -9,7 +9,8 @@ Build-Depends:
  dh-python,
  help2man,
  lsb-release,
- python3-all
+ python3-all,
+ python3-distro
 Standards-Version: 3.9.8
 Homepage: https://micahflee.com/torbrowser-launcher/
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher.git


=====================================
debian/patches/0015-Update-setup.py.patch
=====================================
@@ -0,0 +1,30 @@
+From: Carl Joseph Hirner III <k.j.hirner.wisdom at gmail.com>
+Date: Sat, 16 Nov 2019 02:08:30 -0800
+Subject: Update setup.py
+
+modified to enable getting distro for python3.8 while maintaining ability to use python3.7 and below
+---
+ setup.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f9739ab..ebeb3e9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,9 +33,13 @@ import subprocess
+ from distutils.core import setup
+ 
+ SHARE = 'share'
+-
+-# detect linux distribution
+-distro = platform.dist()[0]
++try:
++    #for distributions that use python3.8
++    import distro as d
++    distro=d.LinuxDistribution()._os_release_info['name']
++except:
++    # detect linux distribution on python >=3.7
++    distro = platform.dist()[0]
+ 
+ 
+ def file_list(path):


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@
 0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
 0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
 0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
+0015-Update-setup.py.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/commit/fffb55b3f3f1e3fadaa9b82a389e612455b93b78

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/commit/fffb55b3f3f1e3fadaa9b82a389e612455b93b78
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20191120/10189eab/attachment-0001.html>