Linux + iPhone Continuity / iMessage / SMS
fix: ubuntu packaging problems
Zack Bartel30c5ca219402
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 37f17fc..2c54e0e 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -14,14 +14,31 @@ jobs:fail-fast: falsematrix:include:+ # one deb per release only because of libavcodec soname# debian bookworm is out of reach (gcc 12).- image: ubuntu:24.04generator: DEB- name: deb+ name: deb-ubuntu24.04runner: ubuntu-latest- image: ubuntu:24.04generator: DEB- name: deb-arm64+ name: deb-ubuntu24.04-arm64+ runner: ubuntu-24.04-arm+ - image: ubuntu:26.04+ generator: DEB+ name: deb-ubuntu26.04+ runner: ubuntu-latest+ - image: ubuntu:26.04+ generator: DEB+ name: deb-ubuntu26.04-arm64+ runner: ubuntu-24.04-arm+ - image: debian:trixie+ generator: DEB+ name: deb-debian13+ runner: ubuntu-latest+ - image: debian:trixie+ generator: DEB+ name: deb-debian13-arm64runner: ubuntu-24.04-arm- image: fedora:latestgenerator: RPM@@ -66,7 +83,10 @@ jobs:run: ctest --test-dir build/release --output-on-failure- name: package- run: cd build/release && cpack -G ${{ matrix.generator }}+ run: |+ cd build/release && cpack -G ${{ matrix.generator }}+ . /etc/os-release+ for f in *.deb; do [ -e "$f" ] && mv "$f" "${f%.deb}~${ID}${VERSION_ID}.deb"; done- uses: actions/upload-artifact@v4with:diff --git a/CMakeLists.txt b/CMakeLists.txtindex 3b1c703..72e9960 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -239,6 +239,8 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]")set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)# alternates cover Ubuntu 24.04's t64 renamesset(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0 | libgtk-3-0t64, libgtk-layer-shell0, libnotify4, libncursesw6, libssl3 | libssl3t64, libwayland-client0, libavahi-client3, libglib2.0-0 | libglib2.0-0t64, bluez, bluez-obexd")+# sonames (libavcodec60, libavcodec62, etc)+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)set(CPACK_DEBIAN_PACKAGE_SECTION "utils")set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/zackb/tether")diff --git a/README.md b/README.mdindex 990e885..b8b7766 100644--- a/README.md+++ b/README.md@@ -123,6 +123,15 @@ curl -fsSL "https://copr.fedorainfracloud.org/coprs/zackb/tether/repo/fedora-$(rrpm-ostree install tether```+### Debian / Ubuntu++Download the `.deb` for your release (`~ubuntu24.04`, `~ubuntu26.04` or `~debian13`) from the+[releases page](https://github.com/zackb/tether/releases), then:++```bash+sudo apt install ./tether_*.deb+```+### AppImageOne file, no install, for distros without a package and for immutable systems.@@ -249,7 +258,7 @@ On Debian/Ubuntu:sudo apt install build-essential cmake ninja-build pkg-config git \libwayland-dev libavahi-client-dev libssl-dev libsecret-1-dev \libglib2.0-dev libgtk-3-dev libgtk-layer-shell-dev libnotify-dev \- libncurses-dev npm zip+ libncurses-dev libavcodec-dev libpipewire-0.3-dev npm zip```On Fedora:diff --git a/scripts/ci-deps.sh b/scripts/ci-deps.shindex e1bce56..2403995 100755--- a/scripts/ci-deps.sh+++ b/scripts/ci-deps.sh@@ -33,7 +33,7 @@ case ${ID_LIKE:-$ID} inlibwayland-dev libavahi-client-dev libssl-dev libglib2.0-dev libsecret-1-dev \libgtk-3-dev libgtk-layer-shell-dev libnotify-dev libncurses-dev \libavcodec-dev libpipewire-0.3-dev \- npm zip gettext+ npm zip gettext dpkg-dev file;;*)echo "ci-deps: unsupported distro: ${ID:-unknown}" >&2