Unity Videos Lens

Merge lp:~stolowski/unity-lens-video/fix-scope-ids into lp:~unity-team/unity-lens-video/libunity7-compatible

  1. fix-scope-ids
  2. Merge into libunity7-compatible
Proposed by Paweł Stołowski
Status: Merged
Approved by: Michal Hruby
Approved revision: 126
Merged at revision: 124
Proposed branch: lp:~stolowski/unity-lens-video/fix-scope-ids
Merge into: lp:~unity-team/unity-lens-video/libunity7-compatible
Diff against target: 68 lines (+9/-9)
5 files modified
configure.ac (+2/-2)
data/Makefile.am (+3/-3)
debian/unity-lens-video.install (+1/-1)
debian/unity-scope-video-remote.install (+1/-1)
po/POTFILES.in (+2/-2)
To merge this branch: bzr merge lp:~stolowski/unity-lens-video/fix-scope-ids
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160180@code.launchpad.net

Commit message

Fixed scope ids.

Description of the change

Fixed scope ids.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:124
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

Missing configure.ac changes.

review: Needs Fixing
Revision history for this message
Michal Hruby (mhr3) wrote :

And maybe it'll be better to s/remote/ubuntuone/?

lp:~stolowski/unity-lens-video/fix-scope-ids updated
125. By Paweł Stołowski

Updated configure.ac and debian/*install files.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/4/rebuild

review: Needs Fixing (continuous-integration)
lp:~stolowski/unity-lens-video/fix-scope-ids updated
126. By Paweł Stołowski

Update POTFILES.in.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/5/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2013-03-13 15:55:38 +0000
+++ configure.ac 2013-04-23 08:49:29 +0000
@@ -174,8 +174,8 @@
174AC_CONFIG_FILES([174AC_CONFIG_FILES([
175 Makefile175 Makefile
176 data/Makefile176 data/Makefile
177 data/video-local.scope.in177 data/local.scope.in
178 data/video-remote.scope.in178 data/remote.scope.in
179 src/Makefile179 src/Makefile
180 po/Makefile.in180 po/Makefile.in
181 src/config.vala181 src/config.vala
182182
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2013-03-14 18:44:52 +0000
+++ data/Makefile.am 2013-04-23 08:49:29 +0000
@@ -9,7 +9,7 @@
9%.service: %.service.in9%.service: %.service.in
10 $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@10 $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
1111
12scope_in_files = video-local.scope.in video-remote.scope.in12scope_in_files = local.scope.in remote.scope.in
13scopedir = $(SCOPESDIR)/video13scopedir = $(SCOPESDIR)/video
14scope_DATA = $(scope_in_files:.scope.in=.scope)14scope_DATA = $(scope_in_files:.scope.in=.scope)
1515
@@ -23,6 +23,6 @@
23CLEANFILES = \23CLEANFILES = \
24 unity-scope-video-remote.service \24 unity-scope-video-remote.service \
25 unity-lens-video.service \25 unity-lens-video.service \
26 video-local.scope \26 local.scope \
27 video-remote.scope \27 remote.scope \
28 $(NULL)28 $(NULL)
2929
=== renamed file 'data/video-local.scope.in.in' => 'data/local.scope.in.in'
=== renamed file 'data/video-remote.scope.in.in' => 'data/remote.scope.in.in'
=== modified file 'debian/unity-lens-video.install'
--- debian/unity-lens-video.install 2013-03-15 13:16:17 +0000
+++ debian/unity-lens-video.install 2013-04-23 08:49:29 +0000
@@ -1,3 +1,3 @@
1/usr/lib/*/unity-lens-video/unity-video-lens-daemon1/usr/lib/*/unity-lens-video/unity-video-lens-daemon
2/usr/share/dbus-1/services/unity-scope-video-local.service2/usr/share/dbus-1/services/unity-scope-video-local.service
3/usr/share/unity/scopes/video/video-local.scope3/usr/share/unity/scopes/video/local.scope
44
=== modified file 'debian/unity-scope-video-remote.install'
--- debian/unity-scope-video-remote.install 2013-03-15 13:16:17 +0000
+++ debian/unity-scope-video-remote.install 2013-04-23 08:49:29 +0000
@@ -1,3 +1,3 @@
1/usr/lib/*/unity-lens-video/unity-scope-video-remote1/usr/lib/*/unity-lens-video/unity-scope-video-remote
2/usr/share/dbus-1/services/unity-scope-video-remote.service2/usr/share/dbus-1/services/unity-scope-video-remote.service
3/usr/share/unity/scopes/video/video-remote.scope3/usr/share/unity/scopes/video/remote.scope
44
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2013-03-13 15:55:38 +0000
+++ po/POTFILES.in 2013-04-23 08:49:29 +0000
@@ -3,5 +3,5 @@
3src/remote-video-main.vala3src/remote-video-main.vala
4src/ubuntu-video-search.vala4src/ubuntu-video-search.vala
5tests/unit/test-ubuntu-video-search.vala5tests/unit/test-ubuntu-video-search.vala
6[type: gettext/ini]data/video-local.scope.in6[type: gettext/ini]data/local.scope.in
7[type: gettext/ini]data/video-remote.scope.in7[type: gettext/ini]data/remote.scope.in

Subscribers

People subscribed via source and target branches