I have made the following changes intended for : CE:Apps / voicecall Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7058 Thank You, tswindell [This message was auto-generated] --- Request # 7058: Messages from BOSS: State: review at 2012-10-17T10:51:26 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:tswindell:CE:Apps / voicecall -> CE:Apps / voicecall changes files: -------------- --- voicecall.changes +++ voicecall.changes @@ -0,0 +1,3 @@ +* Wed Oct 17 2012 Tom Swindell <[email protected]> - 0.2.2 +- Updated sources to latest upstream version. + old: ---- voicecall-0.2.1+git10.d77f53c.tar.gz voicecall-manager.service voicecall-ui-prestart.service new: ---- voicecall-0.2.2.tar.gz spec files: ----------- --- voicecall.spec +++ voicecall.spec @@ -1,13 +1,11 @@ Name: voicecall Summary: Voice Call Suite -Version: 0.2.1+git10.d77f53c +Version: 0.2.2 Release: 1 Group: Communications/Telephony and IM License: Apache License, Version 2.0 URL: http://github.com/nemomobile/voicecall Source0: %{name}-%{version}.tar.gz -Source1: voicecall-manager.service -Source2: voicecall-ui-prestart.service BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(QtDeclarative) BuildRequires: pkgconfig(QtMultimediaKit) @@ -80,9 +78,6 @@ %install rm -rf %{buildroot} %qmake_install -mkdir -p %{buildroot}%{_libdir}/systemd/user/ -cp -a %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/ -cp -a %{SOURCE2} %{buildroot}%{_libdir}/systemd/user/ %post libs /sbin/ldconfig @@ -123,4 +118,3 @@ %{_datadir}/applications/voicecall-ui.desktop %config %{_sysconfdir}/xdg/autostart/voicecall-ui-prestart.desktop %{_libdir}/systemd/user/voicecall-ui-prestart.service - other changes: -------------- ++++++ voicecall-0.2.1+git10.d77f53c.tar.gz -> voicecall-0.2.2.tar.gz --- packaging/voicecall.spec.in +++ packaging/voicecall.spec.in @@ -100,6 +100,7 @@ %{_libdir}/voicecall/plugins/libvoicecall-telepathy-plugin.so %config %{_sysconfdir}/xdg/autostart/voicecall-manager.desktop %config %{_sysconfdir}/voicecall/modes.ini +%{_libdir}/systemd/user/voicecall-manager.service %files devel %defattr(-,root,root,-) @@ -116,3 +117,4 @@ %{_datadir}/voicecall-ui/qml %{_datadir}/applications/voicecall-ui.desktop %config %{_sysconfdir}/xdg/autostart/voicecall-ui-prestart.desktop +%{_libdir}/systemd/user/voicecall-ui-prestart.service --- ui/qml/HistoryPage.qml +++ ui/qml/HistoryPage.qml @@ -73,18 +73,18 @@ break; case 'missed': - filterRole = CallEventModel.IsMissedCallRole + filterRole = CommCallModel.IsMissedCallRole filterString = 'true' break; case 'incoming': - filterRole = CallEventModel.DirectionRole - filterString = '' + CallEventModel.Inbound + filterRole = CommCallModel.DirectionRole + filterString = '' + CommCallModel.Inbound break; case 'outgoing': - filterRole = CallEventModel.DirectionRole - filterString = '' + CallEventModel.Outbound + filterRole = CommCallModel.DirectionRole + filterString = '' + CommCallModel.Outbound break; } @@ -113,7 +113,7 @@ width:parent.width - 10 spacing:4 clip:true - //model: CallEventModel {} + model: CommCallModel {} delegate: Item { width:parent.width;height:72 @@ -128,7 +128,7 @@ Image { anchors.verticalCenter:parent.verticalCenter smooth:true - source: 'images/icon-m-telephony-call-' + (model.isMissedCall ? 'missed' : (model.direction == CallEventModel.Inbound ? 'received' : 'initiated')) + '.svg' + source: 'images/icon-m-telephony-call-' + (model.isMissedCall ? 'missed' : (model.direction == CommCallModel.Inbound ? 'received' : 'initiated')) + '.svg' } Column { --- ui/ui.pro +++ ui/ui.pro @@ -3,7 +3,7 @@ SUBDIRS = src OTHER_FILES += qml/*.qml -OTHER_FILES += LICENSE voicecall-ui.yaml *.desktop +OTHER_FILES += LICENSE voicecall-ui.yaml *.desktop *.service autostart_entry.files = voicecall-ui-prestart.desktop autostart_entry.path = /etc/xdg/autostart @@ -11,7 +11,10 @@ desktopfile_entry.files = voicecall-ui.desktop desktopfile_entry.path = /usr/share/applications +systemd_service_entry.files = voicecall-ui-prestart.service +systemd_service_entry.path = /usr/lib/systemd/user + qml.files = qml qml.path = /usr/share/voicecall-ui -INSTALLS += qml desktopfile_entry autostart_entry +INSTALLS += qml desktopfile_entry autostart_entry systemd_service_entry --- ui/voicecall-ui-prestart.service +++ ui/voicecall-ui-prestart.service @@ -0,0 +1,8 @@ +[Unit] +Description=Voicecall ui prestart +After=xorg.target +Requires=dbus.socket xorg.target voicecall-manager.service + +[Service] +ExecStart=/usr/bin/voicecall-ui -prestart + --- voicecall-manager.service +++ voicecall-manager.service @@ -0,0 +1,8 @@ +[Unit] +Description=Voicecall manager +After=xorg.target +Requires=dbus.socket xorg.target + +[Service] +ExecStart=/usr/bin/voicecall-manager + --- voicecall.pro +++ voicecall.pro @@ -2,9 +2,12 @@ CONFIG = ordered SUBDIRS = lib plugins src ui -OTHER_FILES = LICENSE *.desktop packaging/voicecall.spec.in makedist +OTHER_FILES = LICENSE *.desktop packaging/voicecall.spec.in makedist voicecall-manager.service autostart_entry.files = voicecall-manager.desktop autostart_entry.path = /etc/xdg/autostart -INSTALLS += autostart_entry +systemd_service_entry.files = voicecall-manager.service +systemd_service_entry.path = /usr/lib/systemd/user + +INSTALLS += autostart_entry systemd_service_entry ++++++ deleted files: --- voicecall-manager.service --- voicecall-ui-prestart.service
