From c25c2c0996525888438a26d5bf5d12c2dbaa1053 Mon Sep 17 00:00:00 2001
From: gabrik <gabriele.baldoni@gmail.com>
Date: Thu, 7 Sep 2023 12:37:00 +0200
Subject: [PATCH] fix deb metadata in different Cargo.toml

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>
---
 zenoh-flow-daemon/Cargo.toml | 25 +++++++++++++------------
 zenoh-flow-plugin/Cargo.toml |  7 ++++---
 zfctl/Cargo.toml             |  3 ++-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/zenoh-flow-daemon/Cargo.toml b/zenoh-flow-daemon/Cargo.toml
index 24635d30..9a359210 100644
--- a/zenoh-flow-daemon/Cargo.toml
+++ b/zenoh-flow-daemon/Cargo.toml
@@ -59,35 +59,35 @@ name = "zenoh-flow-daemon"
 assets = [
   # binary
   [
-    "/usr/bin/zenoh-flow-daemon",
-    "755",
     "target/release/zenoh-flow-daemon",
+    "/usr/bin/zenoh-flow-daemon",
+    "755"
   ],
   # assets
   [
-    "/etc/zenoh-flow/extensions.d/placeholder",
-    "644",
     "etc/extensions.d/placeholder",
+    "/etc/zenoh-flow/extensions.d/placeholder",
+    "644"
   ],
   [
-    "/etc/zenoh-flow/runtime.yaml",
-    "644",
     "etc/runtime.yaml",
+    "/etc/zenoh-flow/runtime.yaml",
+    "644"
   ],
   [
-    "/etc/zenoh-flow/zenoh-daemon.json",
-    "644",
     "etc/zenoh-daemon.json",
+    "/etc/zenoh-flow/zenoh-daemon.json",
+    "644"
   ],
   [
+     "etc/zenoh-zf-router.json",
     "/etc/zenoh-flow/zenoh-zf-router.json",
-    "644",
-    "etc/zenoh-zf-router.json",
+    "644"
   ],
   [
-    "/var/zenoh-flow",
-    "644",
     "var/*",
+    "/var/zenoh-flow",
+    "644"
   ],
 ]
 copyright = "2021 - 2023 ZettaScale Technology"
@@ -97,6 +97,7 @@ license-file = ["../LICENSE", "0"]
 maintainer = "ZettaScale Zenoh Team, <zenoh@zettascale.tech>"
 priority = "optional"
 section = "utils"
+revision = ""
 
 conf-files = ["/etc/zenoh-flow/runtime.yaml"]
 
diff --git a/zenoh-flow-plugin/Cargo.toml b/zenoh-flow-plugin/Cargo.toml
index 5d122776..4559f3b4 100644
--- a/zenoh-flow-plugin/Cargo.toml
+++ b/zenoh-flow-plugin/Cargo.toml
@@ -59,9 +59,9 @@ rustc_version = "0.4"
 assets = [
   # binary
   [
-    "/usr/lib/libzenoh_plugin_zenoh_flow.so",
-    "644",
     "target/release/libzenoh_plugin_zenoh_flow.so",
+    "/usr/lib/libzenoh_plugin_zenoh_flow.so",
+    "644"
   ],
   # assets
   [
@@ -75,9 +75,9 @@ assets = [
     "644",
   ],
   [
+    "etc/zenoh-zf-plugin.json",
     "/etc/zenoh-flow/zenoh-zf-plugin.json",
     "644",
-    "etc/zenoh-zf-plugin.json",
   ],
 ]
 copyright = "2021 - 2023 ZettaScale Technology Inc."
@@ -86,3 +86,4 @@ license-file = ["../LICENSE", "0"]
 maintainer = "zenoh-dev@eclipse.org"
 name = "zenoh-plugin-zenoh-flow"
 section = "net"
+revision = ""
diff --git a/zfctl/Cargo.toml b/zfctl/Cargo.toml
index 1d3b8f83..2293e66d 100644
--- a/zfctl/Cargo.toml
+++ b/zfctl/Cargo.toml
@@ -55,7 +55,7 @@ zrpc-macros = { workspace = true }
 [package.metadata.deb]
 assets = [
   # binary
-  ["/usr/bin/zfctl", "755", "target/release/zfctl"],
+  ["target/release/zfctl", "/usr/bin/zfctl", "755"],
   # config
   [".config/zfctl-zenoh.json", "/etc/zenoh-flow/zfctl-zenoh.json", "644"],
 ]
@@ -66,6 +66,7 @@ license-file = ["../LICENSE", "0"]
 maintainer = "ZettaScale Zenoh Team, <zenoh@zettascale.tech>"
 priority = "optional"
 section = "utils"
+revision = ""
 
 # RPM package configuration