I have made the following changes intended for : CE:MW:Shared / buteo-syncfw
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/8377 Thank You, aard [This message was auto-generated] --- Request # 8377: Messages from BOSS: State: review at 2013-03-06T09:48:48 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:aard:branches:CE:MW:Shared / buteo-syncfw -> CE:MW:Shared / buteo-syncfw changes files: -------------- --- buteo-syncfw.changes +++ buteo-syncfw.changes @@ -0,0 +1,3 @@ +* Tue Mar 05 2013 Bernd Wachter <[email protected]> - 0.6.1 +- Change from xdg autostart to providing an user session service file + old: ---- buteo-syncfw-0.6.0.tar.gz new: ---- buteo-syncfw-0.6.1.tar.gz spec files: ----------- --- buteo-syncfw.spec +++ buteo-syncfw.spec @@ -1,5 +1,5 @@ Name: buteo-syncfw -Version: 0.6.0 +Version: 0.6.1 Release: 1 Summary: Synchronization backend Group: System/Libraries @@ -23,7 +23,7 @@ %files %defattr(-,root,root,-) %config %{_sysconfdir}/sync/* -%config %{_sysconfdir}/xdg/autostart/*.desktop +%config %{_libdir}/systemd/user/*.service %config %{_sysconfdir}/syncwidget/* %{_bindir}/msyncd %{_libdir}/*.so.* other changes: -------------- ++++++ buteo-syncfw-0.6.0.tar.gz -> buteo-syncfw-0.6.1.tar.gz --- .gitignore +++ .gitignore @@ -0,0 +1,4 @@ +Makefile +*.so* +*.prl +pkgconfig/ --- msyncd/bin/msyncd.desktop +++ msyncd/bin/msyncd.desktop @@ -1,4 +0,0 @@ -[Desktop Entry] -Exec=/usr/bin/msyncd -Name=Synchronization daemon -Type=Application --- msyncd/bin/msyncd.service +++ msyncd/bin/msyncd.service @@ -0,0 +1,6 @@ +[Unit] +Description=Sync FW daemon +Requires=dbus.socket + +[Service] +ExecStart=/usr/bin/msyncd --- msyncd/msyncd.pro +++ msyncd/msyncd.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = +TARGET = QT += xml \ dbus \ sql \ @@ -18,7 +18,7 @@ QMAKE_PKGCONFIG_INCDIR = $$headers.path pkgconfig.files = $${TARGET}.pc -DEPENDPATH += . +DEPENDPATH += . INCLUDEPATH += . \ ../ \ ../libsynccommon \ @@ -26,7 +26,7 @@ ../libsyncprofile \ /usr/include/accounts-qt \ /usr/include/iphbd/ \ - + PKGCONFIG += dbus-1 libsignon-qt accounts-qt QMAKE_LIBDIR_QT += ../libsyncprofile/ @@ -38,7 +38,7 @@ -lsyncprofile \ -lsynccommon \ -laccounts-qt \ - -liphb + -liphb # Input @@ -103,13 +103,14 @@ target.path = /usr/bin/ loglevel.files = bin/set_sync_log_level loglevel.path = /etc/sync/ -meego.files = bin/msyncd.desktop -meego.path = /etc/xdg/autostart/ +service.files = bin/msyncd.service +service.path = /usr/lib/systemd/user/ syncwidget.path = /etc/syncwidget/ syncwidget.files = com.meego.msyncd INSTALLS += target \ loglevel \ - syncwidget + syncwidget \ + service # clean QMAKE_CLEAN += $(TARGET) @@ -121,7 +122,7 @@ # ##################################################################### coverage.CONFIG += recursive QMAKE_EXTRA_TARGETS += coverage -CONFIG(debug,debug|release) { +CONFIG(debug,debug|release) { QMAKE_EXTRA_TARGETS += cov_cxxflags \ cov_lflags cov_cxxflags.target = coverage @@ -134,7 +135,7 @@ += \ -fprofile-arcs \ -ftest-coverage - + # QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage # QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage # -ftest-coverage
