Merge lp:~donadigo/switchboard-plug-parental-controls/fix-service-not-present into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

Proposed by Adam Bieńkowski
Status: Merged
Approved by: Danielle Foré
Approved revision: 247
Merged at revision: 247
Proposed branch: lp:~donadigo/switchboard-plug-parental-controls/fix-service-not-present
Merge into: lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk
Diff against target: 14 lines (+2/-1)
1 file modified
data/CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~donadigo/switchboard-plug-parental-controls/fix-service-not-present
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+313933@code.launchpad.net

Commit message

* Fix parental control service not being installed by an error

Description of the change

This branch "intends" to fix bug #1629616: "Parental Control settings do not save or work".

After some investigation, Corentin found out that the service is not installed, therefore the daemon isn't starting (much thanks!). This should be able to fix the current critical bugs that were reported due to this.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-12-09 17:17:31 +0000
3+++ data/CMakeLists.txt 2017-01-01 00:38:26 +0000
4@@ -5,4 +5,5 @@
5 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
6 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service DESTINATION share/dbus-1/system-services)
7 install (FILES org.pantheon.ParentalControls.conf DESTINATION /etc/dbus-1/system.d)
8-install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
9\ No newline at end of file
10+install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
11+install (FILES pantheon-parental-controls.service DESTINATION /lib/systemd/system)
12\ No newline at end of file
13
14=== renamed file 'debian/pantheon-parental-controls.service' => 'data/pantheon-parental-controls.service'

Subscribers

People subscribed via source and target branches

to all changes: