Merge pull request #364 from himmelblau-idm/stable-0.8.x_intune-porta…

…l-compatible

Only the himmelblau-sso package should conflict with intune-portal

Cargo.toml

@@ -19,7 +19,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.8.5"
+version = "0.8.6"
 authors = [
     "David Mulder <[email protected]>"
 ]

src/daemon/Cargo.toml

@@ -55,10 +55,8 @@ assets = [
   ["target/release/aad-tool", "usr/bin/", "755"],
   ["../../platform/debian/himmelblaud-tasks.service", "etc/systemd/system/", "644"],
   ["../../platform/debian/himmelblaud.service", "etc/systemd/system/", "644"],
-  ["../../platform/debian/com.microsoft.identity.broker1.service", "usr/share/dbus-1/services/", "644"],
   ["target/release/himmelblaud", "usr/sbin/", "755"],
   ["target/release/himmelblaud_tasks", "usr/sbin/", "755"],
-  ["target/release/broker", "usr/sbin/", "755"],
   ["../../README.md", "usr/share/doc/himmelblau/README", "644"],
   ["../../man/man1/aad-tool.1", "usr/share/man/man1/", "644"],
   ["../../man/man5/himmelblau.conf.5", "usr/share/man/man5/", "644"],
@@ -75,10 +73,8 @@ assets = [
   { source = "target/release/aad-tool", dest = "/usr/bin/", mode = "755" },
   { source = "../../platform/opensuse/himmelblaud-tasks.service", dest = "/usr/lib/systemd/system/", mode = "644" },
   { source = "../../platform/opensuse/himmelblaud.service", dest = "/usr/lib/systemd/system/", mode = "644" },
-  { source = "../../platform/opensuse/com.microsoft.identity.broker1.service", dest = "/usr/share/dbus-1/services/", mode = "644" },
   { source = "target/release/himmelblaud", dest = "/usr/sbin/", mode = "755" },
   { source = "target/release/himmelblaud_tasks", dest = "/usr/sbin/", mode = "755" },
-  { source = "target/release/broker", dest = "/usr/sbin/", mode = "755" },
   { source = "../../README.md", dest = "/usr/share/doc/himmelblau/README", mode = "644" },
   { source = "../../man/man1/aad-tool.1", dest = "/usr/share/man/man1/", mode = "644" },
   { source = "../../man/man5/himmelblau.conf.5", dest = "/usr/share/man/man5/", mode = "644" },

src/sso/Cargo.toml

@@ -32,6 +32,8 @@ assets = [
   ["src/chrome/extension.json", "usr/share/google-chrome/extensions/jlnfnnolkbjieggibinobhkjdfbpcohn.json", "644"],
   ["src/chrome/policies.json", "etc/opt/chrome/policies/managed/himmelblau.json", "644"],
   ["src/chrome/policies.json", "etc/chromium/policies/managed/himmelblau.json", "644"],
+  ["../../platform/debian/com.microsoft.identity.broker1.service", "usr/share/dbus-1/services/", "644"],
+  ["target/release/broker", "usr/sbin/", "755"],
 ]
 
 [package.metadata.generate-rpm]
@@ -45,4 +47,6 @@ assets = [
   { source = "src/chrome/extension.json", dest = "/usr/share/google-chrome/extensions/jlnfnnolkbjieggibinobhkjdfbpcohn.json", mode = "644" },
   { source = "src/chrome/policies.json", dest = "/etc/opt/chrome/policies/managed/himmelblau.json", mode = "644" },
   { source = "src/chrome/policies.json", dest = "/etc/chromium/policies/managed/himmelblau.json", mode = "644" },
+  { source = "../../platform/opensuse/com.microsoft.identity.broker1.service", dest = "/usr/share/dbus-1/services/", mode = "644" },
+  { source = "target/release/broker", dest = "/usr/sbin/", mode = "755" },
 ]