From 5d389265c37d02b46c4b239f3ba3d91084724508 Mon Sep 17 00:00:00 2001
From: pips <pips@e5150.fr>
Date: Tue, 23 Sep 2025 20:22:57 +0200
Subject: [PATCH] feat(project): configure

---
 .gitmodules                |  3 +++
 .woodpecker/build.yaml     |  2 --
 Dockerfile.builder         | 11 ++++++-----
 Makefile                   | 10 ++++------
 README.md                  | 21 ++++++++++++++++-----
 deb-package/DEBIAN/control | 15 +++++++--------
 upstream                   |  1 +
 7 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 upstream

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b1ab090
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "upstream"]
+	path = upstream
+	url = https://github.com/Supreeeme/xwayland-satellite.git
diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 86bf83d..d57fe63 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -37,5 +37,3 @@ steps:
     environment:
       password:
         from_secret: package_token
-      commit_abbrev: ${CI_COMMIT_SHA:0:7}
-
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 5ce7e81..b97e965 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,8 +1,9 @@
-# use specific image if relevant (rust, golang)
 FROM ubuntu:24.04
 
 RUN apt-get update && \
-    apt-get install -y make \
-    # other packages to build \
-
-
+    apt-get install -y curl \
+    make \
+    clang \
+    libxcb-cursor-dev \
+    rustup && \
+    rustup default stable
diff --git a/Makefile b/Makefile
index 98140fa..ff58a78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,14 @@
-
-package = mypackage.deb
+package = xwaylland-satellite-main.deb
 
 .PHONY: compile
 compile:
-	cd upstream && echo compile
+	cd upstream && cargo build --release -F systemd
 
 .PHONY: dpkg
 dpkg:
 	mkdir -p deb-package/usr/bin/
-	cp upstream/bin deb-package/usr/bin/
+	cp upstream/target/release/xwayland-satellite deb-package/usr/bin/
 	chmod -R o-w deb-package/
-	sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control
-	sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control
+	sed -i "s|%date%|`date +%Y%m%d%H%M%S`|g" deb-package/DEBIAN/control
 	dpkg-deb --build deb-package/ $(package)
 	@curl --user CIBot:$(password) --upload-file $(package) $(CI_FORGE_URL)/api/packages/$(CI_REPO_OWNER)/debian/pool/noble/main/upload
diff --git a/README.md b/README.md
index 84455ed..9e797d0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,17 @@
-# Template for external project package building
+# Unofficial dpkg xwayland-satellite build from main branch
 
-- git submodule add <https://repo.example.com/external/repo.git> upstream
-- Makefile: change package name & compile / dpkg target instructions
-- Dockerfile.builder: required deb packages / base image
-- deb-package/DEBIAN/control: Package name, depends, conflict & description
+xwayland-satellite xwayland-satellite grants rootless Xwayland integration to
+any Wayland compositor implementing xdg_wm_base and viewporter:
+
+- <https://github.com/Supreeeme/xwayland-satellite>
+
+All credit to Supreeeme and other contributors of this fantastic project!
+
+This repo provide semi-automatic build of main branch to ubuntu 24.04 (noble)
+dpkg package:
+
+<https://forge.e5150.fr/ext/xwayland-satellite>
+
+License file in this repo only apply to build & packaging step files,
+xwayland-satellite is licensed as Mozilla Public License Version 2.0, see
+upstream project for details.
diff --git a/deb-package/DEBIAN/control b/deb-package/DEBIAN/control
index 280352a..d602399 100644
--- a/deb-package/DEBIAN/control
+++ b/deb-package/DEBIAN/control
@@ -1,12 +1,11 @@
-Package: mypackage-main
-Version: 0.0.1~git%date%.%hash%-1
+Package: xwaylland-satellite-main
+Version: 0.0.1~git%date%-1
 Section: base
 Priority: optional
 Architecture: amd64
 Maintainer: pips <pips@e5150.fr>
-Homepage: https://example.com
-Suggests: suggeted-packages
-Depends: depends (>= X.Y.Z), packages (>= X.Y)
-Conflicts: package-from-official-repo
-Description: Description of mypackage
- Auto packaging of mypackage following main dev branch
+Homepage: https://forge.e5150.fr/ext/xwayland-satellite
+Depends: libxcb-cursor0, xcb, xwayland (>= 23.1)
+Suggests: fonts-font-awesome, libappindicator3-1
+Description: xwayland-satellite build from main
+ Auto packaging of xwayland-satellite following main dev branch
diff --git a/upstream b/upstream
new file mode 160000
index 0000000..0336854
--- /dev/null
+++ b/upstream
@@ -0,0 +1 @@
+Subproject commit 03368548ba745e17a85bd631613a59cb2d8469a4