Debian CI + packaging fixes

.github/workflows/debian-experimental.yml

@@ -0,0 +1,62 @@
+name: debian-experimental
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build experimental .debs (${{ matrix.arch }})
+    runs-on: ${{ matrix.runner }}
+    container: debian:experimental
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+    env:
+      DEB_BUILD_OPTIONS: nocheck
+      DEB_BUILD_PROFILES: nocheck
+    steps:
+      - name: install deps
+        run: |
+          apt-get update
+          apt-get -y --no-install-recommends install \
+            build-essential \
+            ca-certificates \
+            devscripts \
+            dpkg-dev \
+            eatmydata \
+            equivs \
+            fakeroot \
+            git \
+            git-buildpackage
+
+      - uses: actions/checkout@v4
+
+      - name: Install build-deps
+        run: |
+          set -euo pipefail
+          eatmydata apt-get -y --no-install-recommends \
+            build-dep .
+
+      - name: Build packages
+        run: |
+          set -euxo pipefail
+          dpkg-buildpackage -us -uc -b
+          mkdir -p debs
+          mv ../*.deb ${GITHUB_WORKSPACE}/debs
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: debs-${{ matrix.arch }}
+          path: debs

Cargo.toml

@@ -13,7 +13,7 @@ libphosh = "0.0.7"
 clap = { version = "4.5.4", features = ["derive"] }
 wayland-client = "0.31"
 zbus = { version = "5", default-features = false, features = ["blocking", "async-io"] }
-nix = { version = "0.29", features = ["signal"] }
+nix = { version = "0.30", features = ["signal"] }
 async-global-executor = "3.0.0"
 futures-util = "0.3.30"
 log = "0.4.22"

debian/control

@@ -4,68 +4,67 @@ Priority: optional
 Maintainer: DebianOnMobile Maintainers <debian-on-mobile-maintainers@alioth-lists.debian.net>
 Uploaders: Arnaud Ferraris <aferraris@debian.org>
 Build-Depends:
- cargo,
  debhelper-compat (= 13),
- libphosh-0.45-dev | libphosh-dev,
-# Dependencies cargo culted from phosh
- gsettings-desktop-schemas-dev (>= 47),
- libadwaita-1-dev,
- libappstream-dev,
- libcallaudio-dev,
- libevince-dev,
- libgirepository1.0-dev,
- libjson-glib-dev,
- libsecret-1-dev,
- libsystemd-dev,
- libfeedback-dev (>= 0.4.0),
- libfribidi-dev,
- libgcr-3-dev,
- libgmobile-dev,
- libgnome-bluetooth-3.0-dev,
- libgnome-desktop-3-dev,
- libgtk-3-dev,
- libgtk-4-dev,
- libgudev-1.0-dev,
- libhandy-1-dev (>= 1.1.90),
- libmm-glib-dev,
- libnm-dev,
- libpam0g-dev,
- libpolkit-agent-1-dev,
- libpulse-dev,
- libsoup-3.0-dev,
- libupower-glib-dev,
- libwayland-dev,
- libxml2-utils,
- linux-libc-dev (>= 5.12) [arm64],
+ dh-cargo,
+ librust-anyhow-1-dev (>= 1.0.82~~),
+ librust-async-channel-2-dev (>= 2.2.1~~),
+ librust-async-global-executor-3-dev (>= 3.0.0~~),
+ librust-log-0.4-dev,
+ librust-clap-4-dev (>= 4.5.4~~),
+ librust-futures-util-0.3-dev (>= 0.3.30~~),
+ librust-glib-0.18+log-macros-dev,
+ librust-glib-build-tools-dev,
+ librust-glob-0.3-dev (>= 0.3.1~~),
+ librust-greetd-ipc-0.10+sync-codec-dev,
+ librust-gtk-0.18+v3-24-dev,
+ librust-libhandy-0.11+v1-6-dev,
+ librust-libphosh-0.0.7-dev,
+ librust-nix-0.30+signal-dev,
+ librust-wayland-client-0.31-dev,
+ librust-zbus-5+async-io-dev (>= 4.3.1~~),
+ librust-zbus-5+blocking-dev (>= 4.3.1~~),
 # Dependencies needed only for tests
  at-spi2-core <!nocheck>,
- dbus-x11 <!nocheck>,
+ dbus-daemon <!nocheck>,
  foot <!nocheck>,
  gnome-settings-daemon <!nocheck>,
+ gnome-shell-common <!nocheck>,
+ librust-input-event-codes-6-dev (>= 6.2.0~~) <!nocheck>,
+ librust-wayland-protocols-0.32+client-dev <!nocheck>,
+ librust-wayland-protocols-misc-0.3+client-dev (>= 0.3.1~~) <!nocheck>,
+ librust-wayland-protocols-wlr-0.3+client-dev <!nocheck>,
+ librust-serde-1-dev <!nocheck>,
+ librust-tempfile-3-dev <!nocheck>,
  phoc <!nocheck>,
-# phosh is needed until the gschema is shipped with the lib package
- phosh <!nocheck>,
+ phosh-common <!nocheck>,
  xauth <!nocheck>,
  xvfb <!nocheck>,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Homepage: https://github.com/samcday/phrog/
 Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/phrog
 Vcs-Git: https://salsa.debian.org/DebianOnMobile-team/phrog.git
-Rules-Requires-Root: no
 
 Package: phrog
 Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ accountsservice,
+ at-spi2-core,
  fonts-lato,
+ gnome-session-bin,
+ gnome-session-common,
+ gnome-settings-daemon,
  gnome-shell-common,
  greetd,
  librsvg2-common,
  phoc,
- polkitd,
+ phosh-common,
  phosh-osk-stevia,
+ polkitd,
 Conflicts: phog
+Provides: phog
+Replaces: phog
 Description: Greetd-compatible greeter for mobile phones
  Phrog is a graphical greeter speaking the `greetd` protocol and aimed at mobile
  devices like smart phones and tablets using touch based inputs and small

debian/phrog.postinst

@@ -2,10 +2,10 @@
 
 set -e
 
-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
     # Ensure our config fragments are taken into account
-    systemctl --system daemon-reload >/dev/null || true
-    systemctl --user daemon-reload >/dev/null || true
+    deb-systemd-invoke --system daemon-reload
+    deb-systemd-invoke --user daemon-reload
 fi
 
 #DEBHELPER#

debian/phrog.postrm

@@ -3,9 +3,11 @@
 set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    # Ensure our config fragments are no longer taken into account
-    deb-systemd-invoke --system daemon-reload
-    deb-systemd-invoke --user daemon-reload
+    if [ -d /run/systemd/system ]; then
+        # Ensure our config fragments are no longer taken into account
+        deb-systemd-invoke --system daemon-reload
+        deb-systemd-invoke --user daemon-reload
+    fi
 fi
 
 #DEBHELPER#