diff --git a/Makefile b/Makefile index 21f1e17..1159234 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all release dev manpages install deb-pkg clean uninstall run run-dialog +.PHONY: all release dev manpages install deb-pkg deb-pkg-broken clean uninstall run run-dialog DESTDIR ?= PREFIX ?= /usr/local @@ -80,7 +80,12 @@ $(RELEASE_OUT)/bscreensaver-settings.desktop: settings/bscreensaver-settings.des mkdir -p $(dir $@) sed -e 's:@BINDIR@:$(BINDIR):g' $< > $@ -deb-pkg: +deb-pkg: manpages $(RELEASE_OUT)/bscreensaver-settings.desktop + HELPER_DIR=$(HELPER_DIR) cargo deb --manifest-path locker/Cargo.toml --deb-revision 1 + +# Recently this stopped working because bookworm only has rust 1.59, but recent versions +# of the zbus crate require rust 1.60. +deb-pkg-broken: @[ "$(RELEASE_VERSION)" ] || { echo "RELEASE_VERSION not set" >&2; exit 1; } sudo rm -rf docker-out docker build -t bscreensaver-build:latest . diff --git a/locker/Cargo.toml b/locker/Cargo.toml index a3ba2ac..bd150e9 100644 --- a/locker/Cargo.toml +++ b/locker/Cargo.toml @@ -12,6 +12,34 @@ readme = "README.md" keywords = ["gui", "screensaver", "screen-locker"] categories = ["gui"] +[package.metadata.deb] +name = "bscreensaver" +maintainer = "Brian Tarricone " +copyright = "2022, Brian Tarricone