diff --git a/Makefile b/Makefile index 2a1efd5..51d5ad9 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ build-fe: fi build-rs: extract-vendor - $(CARGO) build $(CARGO_BUILD_ARGS) -p gpclient -p gpauth -p gpservice - $(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol" + $(CARGO) build $(CARGO_BUILD_ARGS) -p gpauth + # $(CARGO) build $(CARGO_BUILD_ARGS) -p gpgui-helper --features "tauri/custom-protocol" clean: $(CARGO) clean @@ -98,17 +98,21 @@ init-debian: debmake - cp -f packaging/deb/control debian/control + cp -f packaging/deb/control.in debian/control cp -f packaging/deb/rules debian/rules rm -f debian/changelog deb: init-debian + sed -i "s/@RUST@//g" debian/control + dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements." debuild --preserve-env -e PATH -us -uc -b # Usage: make ppa SERIES=focal ppa: init-debian + sed -i "s/@RUST@/rust-all(>=1.70)/g" debian/control + $(eval SERIES_VER = $(shell distro-info --series $(SERIES) -r | cut -d' ' -f1)) @echo "Building for $(SERIES) $(SERIES_VER)" diff --git a/packaging/deb/control b/packaging/deb/control.in similarity index 71% rename from packaging/deb/control rename to packaging/deb/control.in index d4b0ab3..c789fb9 100644 --- a/packaging/deb/control +++ b/packaging/deb/control.in @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Kevin Yue Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 9), pkg-config, rust-all (>= 1.70), jq (>= 1), make (>= 4), openconnect (>= 8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, libwebkit2gtk-4.0-37, libgtk-3-0, gnome-keyring +Build-Depends: debhelper (>= 9), pkg-config, jq (>= 1), make (>= 4), openconnect (>= 8.20), libxml2, libsecret-1-0, libayatana-appindicator3-1, libwebkit2gtk-4.0-37, libgtk-3-0, gnome-keyring, @RUST@ Homepage: https://github.com/yuezk/GlobalProtect-openconnect Package: globalprotect-openconnect