Merge lp:~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk
Proposed by
Adam Bieńkowski
Status: | Merged |
---|---|
Approved by: | Cody Garver |
Approved revision: | 230 |
Merged at revision: | 229 |
Proposed branch: | lp:~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes |
Merge into: | lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk |
Diff against target: |
88 lines (+15/-12) 6 files modified
data/CMakeLists.txt (+1/-9) data/pantheon-parental-controls-client.desktop (+5/-1) debian/control (+1/-0) debian/install (+0/-1) debian/rules (+7/-1) debian/switchboard-plug-parental-controls.links (+1/-0) |
To merge this branch: | bzr merge lp:~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary Pantheon team | Pending | ||
Review via email: mp+305349@code.launchpad.net |
Commit message
* Fix client desktop entries
* Use dh_systemd
Description of the change
This branch fixes debian packaging to not ask for root permissions for building this package. It also fixes some entries in client desktop file and makes use of native dh_systemd to start / enable systemd service.
To post a comment you must log in.