summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--debian/README6
-rw-r--r--debian/README.source10
-rw-r--r--debian/changelog4
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules11
6 files changed, 9 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore
index 6dab9c2..59198b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ __pycache__
build
dist
deploy
+staging_dir
/bitmask-vpn
cmd/bitmask-vpn/bitmask-vpn
/bitmask-helper
diff --git a/debian/README b/debian/README
index 7a4f677..9e6aef8 100644
--- a/debian/README
+++ b/debian/README
@@ -1,7 +1,7 @@
-The Debian Package riseup-vpn
-----------------------------
+riseup-vpn
+-----------
Initial debianization of bitmask-vpn repo. This is a native package for
riseup-vpn, branded clients will use a template based on that one.
- -- Kali Kaneko <kali@leap.se> Tue, 09 Feb 2021 20:26:52 +0100
+ -- kali kaneko <kali@leap.se> Tue, 09 Feb 2021 20:26:52 +0100
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 12435e8..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-riseup-vpn for Debian
---------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
- -- Kali Kaneko <kali@leap.se> Tue, 09 Feb 2021 20:26:52 +0100
-
diff --git a/debian/changelog b/debian/changelog
index 1ee2a71..9febc48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-riseup-vpn (0.21.2) unstable; urgency=medium
+riseup-vpn (0.21.2.1) groovy; urgency=medium
* Initial Release.
- -- Kali Kaneko <kali@leap.se> Tue, 09 Feb 2021 20:26:52 +0100
+ -- kali kaneko (leap communications) <kali@leap.se> Tue, 09 Feb 2021 20:26:52 +0100
diff --git a/debian/control b/debian/control
index 194ba39..af7cee2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: riseup-vpn
Section: net
Priority: extra
Maintainer: LEAP Encryption Access Project <debian@leap.se>
-Build-Depends: debhelper-compat (= 12), golang-go (>= 2:1.9), make, pkg-config, g++, git,
+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
@@ -12,7 +12,8 @@ Homepage: https://0xacab.org/leap/bitmask-vpn
Package: riseup-vpn
Architecture: any
Enhances: openvpn
-Depends: libqt5core5a, libqt5gui5 | libqt5gui5-gles, libqt5qml5, libqt5widgets5, libstdc++6,
+Depends: ${misc:Depends}, libqt5core5a, libqt5gui5 | libqt5gui5-gles,
+ libqt5qml5, libqt5widgets5, libstdc++6,
qml-module-qtquick2, qml-module-qtquick-controls, qml-module-qtquick-dialogs,
qml-module-qtquick-extras, qml-module-qt-labs-platform,
openvpn, policykit-1-gnome | polkit-1-auth-agent, python3
diff --git a/debian/rules b/debian/rules
index 16242b4..91cc654 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
export DH_VERBOSE = 1
export VERBOSE = 1
@@ -32,11 +30,9 @@ endif
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
%:
dh $@
-
override_dh_auto_build:
make build
@@ -50,12 +46,5 @@ override_dh_install:
strip $(CURDIR)/debian/${APPNAME}/usr/bin/${APPNAME}
dh_install
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
override_dh_dwz:
echo "skipping dh_dwz"
-
-