From ab1491f0857d9a92fa575c4fdb5f69bc032053a0 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Fri, 29 Apr 2016 20:51:12 +0200
Subject: [PATCH] Rename share/dbus-1 to etc/dbus-1 to not mix it up with
 data/shared

refs #615
---
 {share => etc}/dbus-1/session.conf        |  7 +------
 install.pri                               | 14 +++++++-------
 installer/installbuilder/qt5-binaries.xml |  6 +++---
 src/blackmisc/dbusserver.cpp              |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)
 rename {share => etc}/dbus-1/session.conf (92%)

diff --git a/share/dbus-1/session.conf b/etc/dbus-1/session.conf
similarity index 92%
rename from share/dbus-1/session.conf
rename to etc/dbus-1/session.conf
index fbbed19e1..707be8672 100644
--- a/share/dbus-1/session.conf
+++ b/etc/dbus-1/session.conf
@@ -35,18 +35,13 @@
     <allow own="*"/>
   </policy>
 
-  <!-- Include legacy configuration location -->
-  <include ignore_missing="yes">../../etc/dbus-1/session.conf</include>
-
   <!-- Config files are placed here that among other things, 
        further restrict the above policy for specific services. -->
   <includedir>session.d</includedir>
 
-  <includedir>../../etc/dbus-1/session.d</includedir>
-
   <!-- This is included last so local configuration can override what's 
        in this standard file -->
-  <include ignore_missing="yes">../../etc/dbus-1/session-local.conf</include>
+  <include ignore_missing="yes">session-local.conf</include>
 
   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
 
diff --git a/install.pri b/install.pri
index 563484e98..c56beb348 100644
--- a/install.pri
+++ b/install.pri
@@ -90,9 +90,9 @@ win32-g++ {
     DBUS_LIBRARIES *= libdbus-1-3.dll
     dbus_library_target.path = $${PREFIX}/bin
 
-    DBUS_CONFIG_SOURCE_DIR = $$[QT_INSTALL_BINS]/..
-    DBUS_CONFIG_FILES *= share/dbus-1/*
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
+    DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
+    DBUS_CONFIG_FILES *= etc/dbus-1/*
+    dbus_config_target.path = $${PREFIX}/etc/dbus-1
 }
 
 win32-msvc2015 {
@@ -105,9 +105,9 @@ win32-msvc2015 {
     DBUS_LIBRARIES *= dbus-1-3.dll
     dbus_library_target.path = $${PREFIX}/bin
 
-    DBUS_CONFIG_SOURCE_DIR = $$[QT_INSTALL_BINS]/..
-    DBUS_CONFIG_FILES *= share/dbus-1/*
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
+    DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
+    DBUS_CONFIG_FILES *= etc/dbus-1/*
+    dbus_config_target.path = $${PREFIX}/etc/dbus-1
 }
 
 macx {
@@ -122,7 +122,7 @@ macx {
     DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1
     DBUS_CONFIG_FILES *= session.conf
     DBUS_CONFIG_FILES *= system.conf
-    dbus_config_target.path = $${PREFIX}/share/dbus-1
+    dbus_config_target.path = $${PREFIX}/etc/dbus-1
 }
 
 for (BINARY, DBUS_BINARIES) {
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 5e1f87d76..e678ab0d7 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -67,13 +67,13 @@
             </distributionFileList>
         </folder>
         <folder>
-            <description>share</description>
+            <description>etc</description>
             <destination>${installdir}/</destination>
-            <name>share</name>
+            <name>etc</name>
             <platforms>windows</platforms>
             <distributionFileList>
                 <distributionDirectory>
-                    <origin>../../dist/share</origin>
+                    <origin>../../dist/etc</origin>
                 </distributionDirectory>
             </distributionFileList>
         </folder>
diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp
index 500aecf83..cb89a49d9 100644
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -102,7 +102,7 @@ namespace BlackMisc
     void CDBusServer::launchDBusDaemon()
     {
         const QString program = QStringLiteral("dbus-daemon");
-        const QStringList arguments = { QStringLiteral("--config-file=../share/dbus-1/session.conf") };
+        const QStringList arguments = { QStringLiteral("--config-file=../etc/dbus-1/session.conf") };
         bool success = QProcess::startDetached(program, arguments);
         if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); }
     }