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

Proposed by Paweł Stołowski on 2013-04-22
Status: Merged
Approved by: Michal Hruby on 2013-04-23
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) 2013-04-22 Approve on 2013-04-23
PS Jenkins bot (community) continuous-integration Approve on 2013-04-23
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.
Michal Hruby (mhr3) wrote :

Missing configure.ac changes.

review: Needs Fixing
Michal Hruby (mhr3) wrote :

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

125. By Paweł Stołowski on 2013-04-23

Updated configure.ac and debian/*install files.

126. By Paweł Stołowski on 2013-04-23

Update POTFILES.in.

Michal Hruby (mhr3) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-03-13 15:55:38 +0000
3+++ configure.ac 2013-04-23 08:49:29 +0000
4@@ -174,8 +174,8 @@
5 AC_CONFIG_FILES([
6 Makefile
7 data/Makefile
8- data/video-local.scope.in
9- data/video-remote.scope.in
10+ data/local.scope.in
11+ data/remote.scope.in
12 src/Makefile
13 po/Makefile.in
14 src/config.vala
15
16=== modified file 'data/Makefile.am'
17--- data/Makefile.am 2013-03-14 18:44:52 +0000
18+++ data/Makefile.am 2013-04-23 08:49:29 +0000
19@@ -9,7 +9,7 @@
20 %.service: %.service.in
21 $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
22
23-scope_in_files = video-local.scope.in video-remote.scope.in
24+scope_in_files = local.scope.in remote.scope.in
25 scopedir = $(SCOPESDIR)/video
26 scope_DATA = $(scope_in_files:.scope.in=.scope)
27
28@@ -23,6 +23,6 @@
29 CLEANFILES = \
30 unity-scope-video-remote.service \
31 unity-lens-video.service \
32- video-local.scope \
33- video-remote.scope \
34+ local.scope \
35+ remote.scope \
36 $(NULL)
37
38=== renamed file 'data/video-local.scope.in.in' => 'data/local.scope.in.in'
39=== renamed file 'data/video-remote.scope.in.in' => 'data/remote.scope.in.in'
40=== modified file 'debian/unity-lens-video.install'
41--- debian/unity-lens-video.install 2013-03-15 13:16:17 +0000
42+++ debian/unity-lens-video.install 2013-04-23 08:49:29 +0000
43@@ -1,3 +1,3 @@
44 /usr/lib/*/unity-lens-video/unity-video-lens-daemon
45 /usr/share/dbus-1/services/unity-scope-video-local.service
46-/usr/share/unity/scopes/video/video-local.scope
47+/usr/share/unity/scopes/video/local.scope
48
49=== modified file 'debian/unity-scope-video-remote.install'
50--- debian/unity-scope-video-remote.install 2013-03-15 13:16:17 +0000
51+++ debian/unity-scope-video-remote.install 2013-04-23 08:49:29 +0000
52@@ -1,3 +1,3 @@
53 /usr/lib/*/unity-lens-video/unity-scope-video-remote
54 /usr/share/dbus-1/services/unity-scope-video-remote.service
55-/usr/share/unity/scopes/video/video-remote.scope
56+/usr/share/unity/scopes/video/remote.scope
57
58=== modified file 'po/POTFILES.in'
59--- po/POTFILES.in 2013-03-13 15:55:38 +0000
60+++ po/POTFILES.in 2013-04-23 08:49:29 +0000
61@@ -3,5 +3,5 @@
62 src/remote-video-main.vala
63 src/ubuntu-video-search.vala
64 tests/unit/test-ubuntu-video-search.vala
65-[type: gettext/ini]data/video-local.scope.in
66-[type: gettext/ini]data/video-remote.scope.in
67+[type: gettext/ini]data/local.scope.in
68+[type: gettext/ini]data/remote.scope.in

Subscribers

People subscribed via source and target branches