[merge] with dev

editions/phosh

@@ -15,10 +15,6 @@ man-db
 ntfs-3g
 zswap-arm
 
-# Display Manager
-#lightdm
-#lightdm-gtk-greeter
-
 # Phosh packages
 gtk3-mobile
 mutter
@@ -35,6 +31,7 @@ gnome-software-mobile
 
 # Gnome packages
 gnome-calculator
+gnome-contacts
 gnome-clocks
 gnome-keyring
 fractal

editions/plasma-mobile

@@ -3,8 +3,13 @@
 # Minimal packages
 sudo
 parted
+<<<<<<< HEAD
 ofonoctl
 libqofono-qt5
+=======
+libqofono-qt5
+ofonoctl
+>>>>>>> dev
 openssh
 haveged
 inxi

editions/plasma-mobile-dev

@@ -3,8 +3,13 @@
 # Minimal packages
 sudo
 parted
+<<<<<<< HEAD
 ofonoctl
 libqofono-qt5
+=======
+libqofono-qt5
+ofonoctl
+>>>>>>> dev
 openssh
 haveged
 inxi

services/phosh

@@ -6,3 +6,7 @@ bluetooth.service
 zswap-arm.service
 bootsplash-hide-when-booted.service
 bootsplash-show-on-shutdown.service
+pinephone-post-install.service
+ofono.service
+eg25.service
+pinephone-modem-audio.service

services/plasma-mobile

@@ -6,3 +6,8 @@ tlp.service
 zswap-arm.service
 bootsplash-hide-when-booted.service
 bootsplash-show-on-shutdown.service
+pinephone-post-install.service
+ofono.service
+eg25.service
+ofonoctl.service
+pinephone-modem-audio.service

services/plasma-mobile-dev

@@ -4,3 +4,8 @@ NetworkManager.service
 bluetooth.service
 tlp.service
 zswap-arm.service
+pinephone-post-install.service
+ofono.service
+eg25.service
+ofonoctl.service
+pinephone-modem-audio.service