From c297717ca6680a67db31e12269821eba43852503 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Thu, 6 Jun 2024 21:54:45 +0200
Subject: [PATCH] deb: update includes

---
 .github/workflows/release.yml | 14 +++++---------
 Cargo.lock                    | 20 ++++++++++++++++++--
 Cargo.toml                    |  4 ++--
 PKGBUILD                      |  1 +
 debian/DEBIAN/postinstall     |  3 ---
 5 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 100644 debian/DEBIAN/postinstall

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 38194c5..f3fe091 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,6 @@
 on:
   release:
-    types: [ created ]
-
+    types: [created]
 jobs:
   release:
     runs-on: [self-hosted, ubuntu]
@@ -15,15 +14,12 @@ jobs:
       - name: Build rust package
         run: cargo build --release --verbose
       - name: Build Flatpak
-        run: |
-          cd flatpak
-          python3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json 
-          flatpak-builder build org.Xetibo.ReSet.json --force-clean 
-          flatpak build-export export build
-          flatpak build-bundle export reset.flatpak org.Xetibo.ReSet
+        run: "cd flatpak\npython3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json \nflatpak-builder build org.Xetibo.ReSet.json --force-clean \nflatpak build-export export build\nflatpak build-bundle export reset.flatpak org.Xetibo.ReSet\n"
       - name: Build Ubuntu package
         run: |
-          cp ./target/release/reset ./debian/.
+          cp ./target/release/reset ./debian/usr/bin/.
+          cp ./reset.desktop ./debian/share/applications/.
+          cp ./src/resources/icons/ReSet.svg ./debian/share/pixmaps/.
           dpkg-deb --build debian
           mv debian.deb reset.deb
       - name: Release
diff --git a/Cargo.lock b/Cargo.lock
index 840083f..fd03979 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -941,6 +941,22 @@ dependencies = [
  "xdg",
 ]
 
+[[package]]
+name = "re_set-lib"
+version = "5.2.2"
+source = "git+https://github.com/Xetibo/ReSet-Lib?branch=dev#52c193abbe75b79d7b54c823ecdb6d272a6f9405"
+dependencies = [
+ "dbus",
+ "dbus-crossroads",
+ "gtk4",
+ "libloading",
+ "libpulse-binding",
+ "once_cell",
+ "serial_test",
+ "toml",
+ "xdg",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -961,7 +977,7 @@ dependencies = [
  "gtk4",
  "ipnetwork",
  "libadwaita",
- "re_set-lib",
+ "re_set-lib 5.2.2 (git+https://github.com/Xetibo/ReSet-Lib?branch=dev)",
  "reset_daemon",
  "tokio",
 ]
@@ -979,7 +995,7 @@ dependencies = [
  "libloading",
  "libpulse-binding",
  "once_cell",
- "re_set-lib",
+ "re_set-lib 5.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test",
  "tokio",
  "toml",
diff --git a/Cargo.toml b/Cargo.toml
index 11fef84..35a4ab4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,8 +9,8 @@ license = "GPL-3.0-or-later"
 [dependencies]
 reset_daemon = "2.1.1"
 # reset_daemon = { git = "https://github.com/Xetibo/ReSet-Daemon", branch = "dev" }
-re_set-lib = "5.2.2"
-# re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" }
+# re_set-lib = "5.2.2"
+re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib", branch = "dev" }
 adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
 dbus = "0.9.7"
 gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] }
diff --git a/PKGBUILD b/PKGBUILD
index 580b629..c1eee23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,3 +18,4 @@ package() {
 	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 	install -Dm644 "src/resources/icons/ReSet.svg" "$pkgdir/usr/share/pixmaps/ReSet.svg"
 }
+
diff --git a/debian/DEBIAN/postinstall b/debian/DEBIAN/postinstall
deleted file mode 100644
index 1524a04..0000000
--- a/debian/DEBIAN/postinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-install -Dm755 target/release/reset /usr/bin/reset
-install -Dm644 reset.desktop /usr/share/applications/reset.desktop
-install -Dm644 src/resources/icons/ReSet.svg /usr/share/pixmaps/ReSet.svg