The Sync Menu

Merge lp:~charlesk/indicator-sync/lp-1050026 into lp:indicator-sync/12.10

  1. lp-1050026
  2. Merge into trunk
Proposed by Charles Kerr
Status: Merged
Merged at revision: 18
Proposed branch: lp:~charlesk/indicator-sync/lp-1050026
Merge into: lp:indicator-sync/12.10
Diff against target: 32 lines (+3/-3)
3 files modified
data/Makefile.am (+1/-1)
data/indicator-sync.service.in (+1/-1)
src/service/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-sync/lp-1050026
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Lars Karlitski (community) Approve
Review via email: mp+124230@code.launchpad.net

Commit message

Store the service in pkglibexecdir instead of libexecdir

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./distribution=quantal,flavor=amd64/13/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good.

review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/14/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/15/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Please bear with me and Jenkins as our jobs are under construction, another test build forthcoming.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/16/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/16/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=amd64/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/17/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sync-ci/./build=pbuilder,distribution=quantal,flavor=i386/18/console

review: Approve (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-sync-autolanding/3/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-sync-autolanding/4/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-sync-autolanding/5/

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

After investigating the Jenkins issue with QA, Allan and I agreed to land this manually.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2012-08-19 07:00:07 +0000
+++ data/Makefile.am 2012-09-13 15:29:20 +0000
@@ -4,7 +4,7 @@
4dbus_services_DATA = indicator-sync.service4dbus_services_DATA = indicator-sync.service
55
6%.service: %.service.in6%.service: %.service.in
7 sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@7 sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
88
9EXTRA_DIST = indicator-sync.service.in9EXTRA_DIST = indicator-sync.service.in
1010
1111
=== modified file 'data/indicator-sync.service.in'
--- data/indicator-sync.service.in 2012-08-19 07:00:07 +0000
+++ data/indicator-sync.service.in 2012-09-13 15:29:20 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=com.canonical.indicator.sync2Name=com.canonical.indicator.sync
3Exec=@libexecdir@/indicator-sync-service3Exec=@pkglibexecdir@/indicator-sync-service
44
=== modified file 'src/service/Makefile.am'
--- src/service/Makefile.am 2012-08-25 21:55:35 +0000
+++ src/service/Makefile.am 2012-09-13 15:29:20 +0000
@@ -1,5 +1,5 @@
11
2libexec_PROGRAMS = indicator-sync-service2pkglibexec_PROGRAMS = indicator-sync-service
33
4indicator_sync_service_SOURCES = \4indicator_sync_service_SOURCES = \
5 $(top_builddir)/src/sync-service-dbus.c \5 $(top_builddir)/src/sync-service-dbus.c \

Subscribers

People subscribed via source and target branches

to all changes: