Skip to content
Snippets Groups Projects
Verified Commit 85a05fe3 authored by micah's avatar micah :speech_balloon:
Browse files

[pkg] Fix python build issues

. python-script-but-no-python-dep: Because python dependency was
  python2|python3, but bitmask-root has #!/usr/bin/python2.7 the python
  dependency was not being properly resolved. To fix this I changed it to use
  ${python:Depends}

. python-depends-but-no-python-helper: debian/rules needs to call the python
  helper

. missing-build-dependency-for-dh-addon and
  missing-build-dependency-for-dh_-command: added the build-dependency in
  debian/control for python2
parent 1691142f
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,8 @@ riseup-vpn (0.19.2-2) unstable; urgency=medium
* Priority: extra was deprecated, changed to optional
* Add missing ${shlibs:Depends} to resolve missing dep on libc
* Change dependency on python2|python3 to ${python:Depends}
* Add lintian overrides for NMU issues
* Add dh_python build-depends and dh_python2 call to debian/rules
-- Micah Anderson <micah@riseup.net> Tue, 03 Sep 2019 09:51:00 -0400
......
......@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: LEAP Encryption Access Project <debian@leap.se>
Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (>> 2:1.9),
golang-golang-x-text-dev (>= 0.3.0-2),
golang-golang-x-text-dev (>= 0.3.0-2), dh-python, python2,
libgtk-3-dev, libappindicator3-dev, pkg-config
Standards-Version: 3.9.8
Uploaders: Micah Anderson <micah@debian.org>
......@@ -14,7 +14,7 @@ Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends},
openvpn, libgtk-3-0, libappindicator3-1,
policykit-1-gnome | polkit-1-auth-agent,
python2 | python3,
${python:Depends}
Enhances: openvpn
Description: Easy, fast, and secure VPN service from Riseup.
This package is a custom build of the new Bitmask VPN client, preconfigured
......
......@@ -10,7 +10,7 @@ export DH_GOLANG_EXCLUDES = vendor
VERSION = debian-$(shell git describe --tags --always)
%:
dh $@ --with golang --buildsystem golang
dh $@ --with golang,python2 --buildsystem golang
override_dh_auto_test:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment