Merge lp:~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Adam Bieńkowski]

* Fix client desktop entries
* Use dh_systemd

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.

[lp:~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes]

229. By Adam Bieńkowski on 2016-09-09

Add missing install changes

230. By Adam Bieńkowski on 2016-09-09

Add missing links file

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-17 13:51:36 +0000
+++ data/CMakeLists.txt	2016-09-09 15:00:40 +0000
@@ -1,15 +1,7 @@
 configure_file (org.pantheon.switchboard.parental-controls.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy)
-configure_file (pantheon-parental-controls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-parental-controls.service)
 configure_file (org.pantheon.ParentalControls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service)
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service DESTINATION share/dbus-1/system-services)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-parental-controls.service DESTINATION /lib/systemd/system)
 install (FILES org.pantheon.ParentalControls.conf DESTINATION /etc/dbus-1/system.d)
-install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
-
-if (ENABLE_DAEMON_STARTUP)
-    set (TARGET_NAME "${CMAKE_CURRENT_BINARY_DIR}/pantheon-parental-controls.service")
-    set (DESTINATION_PATH "/etc/systemd/system/multi-user.target.wants/")
-    execute_process(COMMAND sudo ln -sf ${TARGET_NAME} ${DESTINATION_PATH})
-ENDIF ()
 \ No newline at end of file
+install (FILES pantheon-parental-controls-client.desktop DESTINATION share/applications)
 \ No newline at end of file
 
=== modified file 'data/pantheon-parental-controls-client.desktop'
--- data/pantheon-parental-controls-client.desktop	2016-08-03 20:28:47 +0000
+++ data/pantheon-parental-controls-client.desktop	2016-09-09 15:00:40 +0000
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Name=Parental Controls Client
 Exec=pantheon-parental-controls-client
+Comment=Show parental control restrictions
 Icon=preferences-system-parental-controls
-Comment=Show parental control restrictions
+Terminal=false
+Type=Application
 NoDisplay=true
+X-GNOME-AutoRestart=true
+X-GNOME-Autostart-Phase=Applications
 \ No newline at end of file
 
=== modified file 'debian/control'
--- debian/control	2015-09-12 02:13:05 +0000
+++ debian/control	2016-09-09 15:00:40 +0000
@@ -4,6 +4,7 @@
 Maintainer: Sergey "Shnatsel" Davidoff <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               dh-systemd (>= 1.5),
                libaccountsservice-dev,
                libgranite-dev,
                libglib2.0-dev,
 
=== modified file 'debian/install'
--- debian/install	2016-02-25 20:32:14 +0000
+++ debian/install	2016-09-09 15:00:40 +0000
@@ -1,5 +1,4 @@
 etc/
-lib/systemd/system
 usr/bin
 usr/lib
 usr/share
 
=== renamed file 'data/pantheon-parental-controls.service.cmake' => 'debian/pantheon-parental-controls.service'
=== modified file 'debian/rules'
--- debian/rules	2015-09-12 02:03:23 +0000
+++ debian/rules	2016-09-09 15:00:40 +0000
@@ -10,7 +10,13 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with systemd
+
+override_dh_systemd_enable:
+	dh_systemd_enable -ppantheon-parental-controls
+
+override_dh_systemd_start:
+	dh_systemd_start -ppantheon-parental-controls
 
 override_dh_strip:
 	dh_strip --dbg-package=switchboard-plug-parental-controls-dbg
 
=== added file 'debian/switchboard-plug-parental-controls.links'
--- debian/switchboard-plug-parental-controls.links	1970-01-01 00:00:00 +0000
+++ debian/switchboard-plug-parental-controls.links	2016-09-09 15:00:40 +0000
@@ -0,0 +1,1 @@
+/usr/share/applications/pantheon-parental-controls-client.desktop /etc/xdg/autostart/pantheon-parental-controls-client.desktop
 \ No newline at end of file