From 39eb4a176ef2fe52247db4ca551fc0f945ffa2ae Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Wed, 7 Jul 2021 19:40:01 +0200
Subject: [pkg] document how to test builds for float

---
 branding/scripts/provider.py               |  9 ++++-----
 branding/templates/debian/compat           |  1 -
 branding/templates/debian/control-template | 17 +++++++++--------
 branding/templates/debian/rules-template   | 21 +++++++++------------
 4 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 branding/templates/debian/compat

(limited to 'branding')

diff --git a/branding/scripts/provider.py b/branding/scripts/provider.py
index 22b36fd..90daa13 100644
--- a/branding/scripts/provider.py
+++ b/branding/scripts/provider.py
@@ -3,13 +3,12 @@ import os
 
 
 def getDefaultProvider(config):
-    if os.environ.get('VENDOR_PATH'):
+    provider = os.environ.get('PROVIDER')
+    if provider:
+        print('[+] Got provider {} from environment'.format(provider))
+    else:
         print('[+] Using default provider from config file')
         provider = config['default']['provider']
-    else:
-        provider = os.environ.get('PROVIDER')
-        if provider:
-            print('[+] Got provider {} from environment'.format(provider))
     return provider
 
 
diff --git a/branding/templates/debian/compat b/branding/templates/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/branding/templates/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/branding/templates/debian/control-template b/branding/templates/debian/control-template
index aaec638..a85b4f6 100644
--- a/branding/templates/debian/control-template
+++ b/branding/templates/debian/control-template
@@ -2,19 +2,20 @@ Source: ${binaryName}
 Section: net
 Priority: extra
 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),
-    libgtk-3-dev, libappindicator3-dev, pkg-config
-Standards-Version: 3.9.8
+Build-Depends: debhelper-compat (= 12), golang-go (>= 2:1.9), make (>=3.80), pkg-config, g++ (>= 4:4.6.3), git,
+        qt5-qmake, qttools5-dev-tools, qtbase5-dev, libqt5qml5, libqt5quick5, qtdeclarative5-dev
+Standards-Version: 4.4.1
+Homepage: https://0xacab.org/leap/bitmask-vpn
 
 Package: ${binaryName}
 Architecture: any
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-    openvpn, libgtk-3-0, libappindicator3-1,
-    policykit-1-gnome | polkit-1-auth-agent,
-    python3,
 Enhances: openvpn
+Depends: ${misc:Depends}, libqt5core5a, libqt5gui5 | libqt5gui5-gles,
+        libqt5qml5, libqt5widgets5, libstdc++6,
+        qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-dialogs,
+        qml-module-qtquick-extras, qml-module-qt-labs-platform,
+        openvpn, policykit-1-gnome | polkit-1-auth-agent, python3
 Description: Easy, fast, and secure VPN service from ${name}.
  This package is a custom build of the new Bitmask VPN client, preconfigured
  to use the ${providerURL} provider.
diff --git a/branding/templates/debian/rules-template b/branding/templates/debian/rules-template
index 9f765ab..bb2c1a0 100755
--- a/branding/templates/debian/rules-template
+++ b/branding/templates/debian/rules-template
@@ -32,20 +32,17 @@ APPNAME = ${binaryName}
 override_dh_auto_test:
 
 override_dh_auto_build:
-	mkdir -p /tmp/gocache
-	rm -rf src/0xacab.org/leap/bitmask-vpn/tools/transifex
-	rm -rf obj-$(DEB_BUILD_GNU_TYPE)/src/0xacab.org/leap/bitmask-vpn/tools/transifex
-	rm -rf tools
-	dh_auto_build -O--buildsystem=golang -- -ldflags "-X main.version=$(VERSION)"
+	make build
 
 override_dh_install:
+	mkdir -p $(CURDIR)/debian/${APPNAME}/usr/bin
 	mkdir -p $(CURDIR)/debian/${APPNAME}/usr/sbin
-	cp $(CURDIR)/helpers/bitmask-root $(CURDIR)/debian/${binaryName}/usr/sbin/
+	cp $(CURDIR)/helpers/bitmask-root $(CURDIR)/debian/${APPNAME}/usr/sbin/
 	mkdir -p $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions
-	cp $(CURDIR)/helpers/se.leap.bitmask.policy   $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions
-	rm -fr $(CURDIR)/debian/${APPNAME}/usr/share/gocode
-	strip $(CURDIR)/debian/${APPNAME}/usr/bin/bitmask-vpn
-	mv $(CURDIR)/debian/${APPNAME}/usr/bin/bitmask-vpn $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME}
-	mkdir -p $(CURDIR)/debian/${APPNAME}/usr/share/${APPNAME}
-	cp $(CURDIR)/debian/icons/scalable/icon.svg $(CURDIR)/debian/${APPNAME}/usr/share/${APPNAME}/icon.svg
+	cp $(CURDIR)/helpers/se.leap.bitmask.policy $(CURDIR)/debian/${APPNAME}/usr/share/polkit-1/actions
+	cp build/qt/release/${APPNAME} $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME}
+	strip $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME}
 	dh_install
+
+override_dh_dwz:
+	echo "skipping dh_dwz"
-- 
cgit v1.2.3