diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/KelvinDashboardGUI/KelvinDashboardGUI.pro index 03286e02d3066f8b1dd677323d80635ed6225e2c..3c8328bef9ba7a5d4eed6a0dd47382d1c5555f59 100755 --- a/KelvinDashboardGUI/KelvinDashboardGUI.pro +++ b/KelvinDashboardGUI/KelvinDashboardGUI.pro @@ -32,7 +32,7 @@ else { # deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS DEFINES += DAP_BRAND=\\\"$$BRAND\\\" -DEFINES += DAP_SERVICE_NAME=\\\"$${BRAND}Service\\\" +DEFINES += DAP_SERVICE_NAME=\\\"kelvin-dashboard\\\" DEFINES += DAP_VERSION=\\\"$$VERSION\\\" ICON = icon.ico # You can also make your code fail to compile if you use deprecated APIs. diff --git a/debian/postinst b/debian/postinst index 98dcbbda49d9977f9298a90ae596312e0afbd45f..d4bc996f3bed5d349ba59408a0c61c65b1e013ca 100755 --- a/debian/postinst +++ b/debian/postinst @@ -3,9 +3,10 @@ case "$1" in configure) - ln -sf /opt/kelvin-dashboard/share/init.d/KelvinDashboardService.service /etc/systemd/user/KelvinDashboardService.service + ln -sf /opt/kelvin-dashboard/share/init.d/kelvin-dashboard.service /etc/systemd/user/KelvinDashboardService.service systemctl --system enable /opt/kelvin-dashboard/share/init.d/KelvinDashboardService.service - ln -s /opt/kelvin-dashboard/bin/KelvinDashboard /usr/local/bin/ + ln -sf /opt/kelvin-dashboard/bin/KelvinDashboard /usr/local/bin/KelvinDashboard + chmod +X /usr/local/bin/KelvinDashboard cp -f /opt/kelvin-dashboard/share/kelvindashboard.desktop /usr/share/applications/kelvindashboard.desktop cp -f /opt/kelvin-dashboard/share/kelvindashboard.ico /usr/share/pixmaps/kelvindashboard.ico update-menus diff --git a/debian/share/init.d/kelvin-dashboard.service b/debian/share/init.d/kelvin-dashboard.service new file mode 100644 index 0000000000000000000000000000000000000000..617569a13b397f3e00267e055ef41ef48f3317c8 --- /dev/null +++ b/debian/share/init.d/kelvin-dashboard.service @@ -0,0 +1,15 @@ +[Unit] +Description=Kelvin Dashboard Service +After=network.target + +[Service] +Type=forking +OOMScoreAdjust=-1000 +PIDFile=/opt/kelvin-dashboard/kelvindashboardservice.pid +WorkingDirectory=/opt/kelvin-dashboard/ +ExecStart=/opt/kelvin-dashboard/bin/KelvinDashboardService -D +ExecStop=/opt/kelvin-dashboard/bin/KelvinDashboardService --stop +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/libdap-qt b/libdap-qt index 948d0658552674cd2826bedae80341774a2101d1..735f35502bf533281c5924c0113130ac072b9280 160000 --- a/libdap-qt +++ b/libdap-qt @@ -1 +1 @@ -Subproject commit 948d0658552674cd2826bedae80341774a2101d1 +Subproject commit 735f35502bf533281c5924c0113130ac072b9280