git.iko.soy/unity8
on xenial help sign in
Fix debian build, move hardcoding of CMAKE_INSTALL_LOCALSTATEDIR to debian/rules
commit5997e63e8d5a3a6e9244cf91545cecb403a6a192 authorMichael Terry <michael.terry@canonical.com> dateThu 22 Aug 2013, 16:16 (13 years ago) parent35d7b3f
4 files changed+8−3
compare with xenial
unifiedsplit
debian/rules+5 plugins/AccountsService/CMakeLists.txt+1−3 tests/plugins/AccountsService/AccountsServer.h+1 tests/plugins/AccountsService/PropertiesServer.h+1
debian/rules+5
@@ -16,6 +16,11 @@ override_dh_auto_clean:
1616 dh_auto_clean
1717 rm -rf builddir
1818
19+override_dh_auto_configure:
20+ # Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
21+ # So until Debian bug 719148 is fixed, do it ourselves.
22+ dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var"
23+
1924override_dh_install:
2025 # install autopilot tests
2126 cd tests/autopilot; \
plugins/AccountsService/CMakeLists.txt+1−3
@@ -12,9 +12,7 @@ qt5_use_modules(AccountsService-qml DBus Qml)
1212export_qmlfiles(AccountsService AccountsService)
1313export_qmlplugin(AccountsService 0.1 AccountsService TARGETS AccountsService-qml)
1414
15−# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
16−# So until Debian bug 719148 is fixed, hardcode it.
17−set(POLKIT_LIB_DIR "/var/lib/polkit-1")
15+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
1816set(POLKIT_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1")
1917set(DBUS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces")
2018set(ACCOUNTS_IFACE_DIR "${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces")
tests/plugins/AccountsService/AccountsServer.h+1
@@ -32,6 +32,7 @@ class AccountsServer: public QObject, protected QDBusContext
3232public:
3333 explicit AccountsServer(QObject *parent = 0);
3434
35+public Q_SLOTS:
3536 QDBusObjectPath FindUserByName(const QString &user);
3637};
3738
tests/plugins/AccountsService/PropertiesServer.h+1
@@ -33,6 +33,7 @@ class PropertiesServer: public QObject, protected QDBusContext
3333public:
3434 explicit PropertiesServer(QObject *parent = 0);
3535
36+public Q_SLOTS:
3637 QDBusVariant Get(const QString &interface, const QString &property);
3738 void Set(const QString &interface, const QString &property, const QDBusVariant &variant);
3839