Debian packaging

.github/workflows/debian.yml

@@ -1,3 +1,9 @@
+# Currently broken, no idea why. Fuckin' thing sucks!
+# It dies immediately on running `dpkg-buildpackage`. Cargo complains it has
+# no valid certs to talk to crates.io, or something. The kicker is it's running
+# in a debian:trixie container and I don't see the same behaviour locally using
+# the same image and running the same commands. So.
+
 name: debian
 
 on:
@@ -18,3 +24,48 @@ jobs:
     container: debian:trixie
     steps:
       - uses: actions/checkout@v4
+      - name: setup Phosh nightly repo
+        run: |
+          cat <<EOF >/etc/apt/sources.list.d/phosh-nightly.sources
+          Types: deb
+          URIs: http://deb.phosh.mobi/nightly/
+          Suites: trixie-nightly
+          Components: main
+          Signed-By:
+            -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+            mQINBGXoHOYBEAC/893ifemxPCa3l+46Vtpjiew4Eu+c3kXEj6sEOQZS8+ZvJ93O
+            So3cEe7tqPM8AjqPjO6GsBjqr86swk5bbZ70GIqo1H2p9JdBaiQWqTDXxXRDvel5
+            0SaxbUQvLm880pjS/gcsBezRv8vb9dxDsPMzap6GuJnF5QqagfOX8B1aQKCywJNo
+            QoFc3RL7c3j2hLRpI4kdfcjo2j3GtjKb+ojWja9dng/gsMlrHYEqS+aWg+eVFnLM
+            XkwJXS/4AQjooH9qC+swtVNYYzt7wQdCm1mNFfrXDHSLse0ugyESqZ8AN5d9bUlB
+            fAae7xv/lV3QfozSolFODvXlBjNaCDYb1r8Rag01eM83b1Wv/R23enFO18p/UW9k
+            +/wk+kOqUfEd+0NBkXdRQiCrvwxHs51IqMFH5aAhM9lHmaHYmdPjETdeYPeKlA22
+            CYLCkApEazGNPZGt6Kv7XeBwiI+6DScbHxr+j9S/j9+7BuMs6MItE4J9EtavkFtr
+            aw/ijGsifCKJWpkD28uZ3h83qi8diUwRde0zrX4SJAUi/T2UXPywep1z6bQ70Vaf
+            YrciSOndw5zWiTYMUDl6q7iZR6vloiZMoGf7psLx1y0Vg4Sq8DPldXAMpaNPh8+Z
+            UhqD94pBGg+iVaYII8MeWHaqtHc0ewQAKAq121rulOuZgaRbl/5LuQp8rQARAQAB
+            tD1QaG9zaCBEZWJpYW4gUGFja2FnZXMgKEFyY2hpdmUgU2lnbmluZyBLZXkpIDxk
+            ZWJzQHBob3NoLm1vYmk+iQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B
+            AheAFiEEeHJPmfZ/wlY1lpbHLf0ViOUfQ7IFAmXoV34FCQlmPBgACgkQLf0ViOUf
+            Q7JWNxAApMQeEKSto6LGZkdqoKXCZgaXg//2UeAnkhK9+Z1hZ2Do7RYhoOW994yi
+            FqtZ92WVMqzbK0EqfEnFX8yVzM1cXo3PgouCDCgTy060YmH0OV2XxThr8fJ4uZfW
+            vib9HE+W4o/dgoMSy3BlPtpB1y/gevgJGoHAtQbV6Ex4bRL89i8pOQJYPYRx5Xj0
+            4SADUWWjOnY9AZbykUlMuRFSOMBWITn8yqUCYPpw8bGbtFignfvK1iRcW5LIkrtY
+            XsOlQCK5+ttNAMUkCeI93LGYhSZUqbpt87tdkbCP5qfV7o7Vkv8iObKw8fxKh2o1
+            oijY8S6ZqEl/CZjDtKcdvsQrEvY3Z1KX0xUNn01PFrHGzRiTn7eieXF4O3PCM2zJ
+            1TGva0gliKUgdN4y8W6Ul1H74T3rhZWpNO10rotfnvyX6AP/bLlkdMdSpL85mcqt
+            PfSROQGcKOU6WmF1G2MvwzBY6sjP3IN95qqnaBKa1IJGBPFt5IsY8eoqdNuNkeRT
+            W3OFcBQas+1RQdDzOZ7svJIX9fNBubebtnB20mRYIwESkhQMO2VpjyrBPzUP+bum
+            kg/7Lx/Gr+OdH2SzNfeTr+28foyKExf2wdhbICErm+eRq1Bh4dFe6ljN/YBUVdEq
+            MHjCZ4GQaiw5Uq+5sQTUWYkFeb/j3NeRadmSTshinPgTISGNYBo=
+            =lIij
+            -----END PGP PUBLIC KEY BLOCK-----
+          EOF
+          DEBIAN_FRONTEND=noninteractive apt-get update
+      - name: apt-get build-dep
+        run: |
+          DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends -t trixie-nightly build-dep .
+      - name: build package
+        run: |
+          dpkg-buildpackage -uc -us -rfakeroot -B

Cargo.toml

@@ -12,7 +12,7 @@ libphosh = "0.0.6"
 clap = { version = "4.5.4", features = ["derive"] }
 wayland-client = "0.31"
 zbus = { version = "4", default-features = false, features = ["blocking", "async-io"] }
-nix = { version = "0.27", features = ["signal"] }
+nix = { version = "0.29", features = ["signal"] }
 async-global-executor = "2.4.1"
 futures-util = "0.3.30"
 log = "0.4.22"

data/phrog-greetd-session

@@ -1,6 +1,4 @@
-#!/bin/sh
-# process substitution is supported by BusyBox ash
-# shellcheck disable=SC3001
+#!/bin/bash
 
 # This simple wrapper script is intended to be used directly by greetd to
 # start up the phrog greeter session.

debian/changelog

@@ -0,0 +1,35 @@
+phrog (0.44.1-1) unstable; urgency=medium
+
+  * New upstream version
+  * d/patches: update for new upstream release
+  * d/control: update build dependencies for current Debian packages.
+    Also add some more packages needed only for running tests, now that we
+    can re-enable them.
+  * d/rules: re-enable build tests.
+    Those were previously relying on downstream libphosh-rs features, which
+    have now been upstreamed. We can therefore re-enable those, adding the
+    corresponding build-dependencies.
+  * debian: install new files provided by phrog.
+    Upstream now provides a wrapper script making use of `systemd-cat` so we
+    can both drop our own wrapper and make our `greetd` config a bit
+    simpler.
+    Also install the new files found under `data/` such as the `.desktop`
+    file and session configurations.
+  * debian: acknowledge repacking is no longer needed.
+    Upstream no longer ships the problematics files nor do they vendor
+    `libphosh-rs` anymore. While at it, update `d/copyright` for the new
+    release.
+  * d/patches: require bash for wrapper script.
+    It isn't POSIX-compliant, potentially leading to runtime problems if the
+    default shell doesn't implement the corresponding bashisms.
+  * debian: reload systemd on installation/removal.
+    Otherwise the systemd config, especially for `greetd.service`, might be
+    out-of-sync.
+
+ -- Arnaud Ferraris <aferraris@debian.org>  Tue, 11 Feb 2025 11:58:40 +0100
+
+phrog (0.10.0+ds1-1) unstable; urgency=medium
+
+  * Initial Debian packaging (Closes: #1082766)
+
+ -- Arnaud Ferraris <aferraris@debian.org>  Wed, 18 Dec 2024 09:12:27 +0100

debian/config/greetd/phrog.toml

@@ -0,0 +1,7 @@
+[terminal]
+vt = 7
+
+# The default session, also known as the greeter.
+[default_session]
+command = "/usr/libexec/phrog-greetd-session"
+user = "_greetd"

debian/config/phoc.ini

@@ -0,0 +1,26 @@
+#[core]
+#xwayland=false
+
+#[output:DSI-1]
+#scale = 2
+
+[output:Virtual-1]
+# For the x86 VM using QXL to get a phone like geometry
+modeline = 87.25  720 776 848 976  1440 1443 1453 1493 -hsync +vsync
+mode = 720x1440
+scale = 2
+
+[output:X11-1]
+mode = 360x720
+#rotate = 90
+#scale = 1
+
+[output:WL-1]
+mode = 360x720
+#rotate = 90
+#scale = 1
+
+[output:HEADLESS-1]
+mode = 720x1440
+#rotate = 90
+scale = 2

debian/config/systemd/phrog.conf

@@ -0,0 +1,6 @@
+[Unit]
+Conflicts=phosh.service
+
+[Service]
+ExecStart=
+ExecStart=greetd --config /etc/greetd/phrog.toml

debian/control

@@ -0,0 +1,75 @@
+Source: phrog
+Section: x11
+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],
+# Dependencies needed only for tests
+ at-spi2-core <!nocheck>,
+ dbus-x11 <!nocheck>,
+ foot <!nocheck>,
+ gnome-settings-daemon <!nocheck>,
+ phoc <!nocheck>,
+# phosh is needed until the gschema is shipped with the lib package
+ phosh <!nocheck>,
+ xauth <!nocheck>,
+ xvfb <!nocheck>,
+Standards-Version: 4.7.0
+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},
+ fonts-lato,
+ gnome-shell-common,
+ greetd,
+ librsvg2-common,
+ phoc,
+ polkitd,
+ phosh-osk-stub |squeekboard,
+Conflicts: 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
+ screens.
+ .
+ It was initially designed for the Phosh Mobile Environment based on GNOME/GTK
+ but can spawn any graphical session.