unity-lens-files

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

  1. fix-scope-ids
  2. Merge into libunity7-compatible
Proposed by Paweł Stołowski
Status: Merged
Approved by: Michal Hruby
Approved revision: 258
Merged at revision: 256
Proposed branch: lp:~stolowski/unity-lens-files/fix-scope-ids
Merge into: lp:~unity-team/unity-lens-files/libunity7-compatible
Diff against target: 39 lines (+4/-4)
3 files modified
Makefile.am (+2/-2)
configure.ac (+1/-1)
po/POTFILES.in (+1/-1)
To merge this branch: bzr merge lp:~stolowski/unity-lens-files/fix-scope-ids
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160179@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:256
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-raring-amd64-ci/2/console

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

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

Missing configure.ac changes.

review: Needs Fixing
lp:~stolowski/unity-lens-files/fix-scope-ids updated
257. By Paweł Stołowski

Updated configure.ac.

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

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

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

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

Updated POTFILES.in.

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

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-files-libunity7-compatible-ci/4/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
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-03-14 18:11:51 +0000
3+++ Makefile.am 2013-04-23 08:45:43 +0000
4@@ -1,9 +1,9 @@
5 SUBDIRS = src data po tests
6
7 #
8-# Install the files-local.scope file
9+# Install the local.scope file
10 #
11-scope_in_files = files-local.scope.in
12+scope_in_files = local.scope.in
13 scopedir = $(SCOPESDIR)/files
14 scope_DATA = $(scope_in_files:.scope.in=.scope)
15
16
17=== modified file 'configure.ac'
18--- configure.ac 2013-03-12 13:43:11 +0000
19+++ configure.ac 2013-04-23 08:45:43 +0000
20@@ -121,7 +121,7 @@
21 #####################################################
22 AC_CONFIG_FILES([
23 Makefile
24- files-local.scope.in
25+ local.scope.in
26 data/Makefile
27 data/com.canonical.Unity.FilesLens.gschema.xml.in
28 src/Makefile
29
30=== renamed file 'files-local.scope.in.in' => 'local.scope.in.in'
31=== modified file 'po/POTFILES.in'
32--- po/POTFILES.in 2013-03-13 11:01:29 +0000
33+++ po/POTFILES.in 2013-04-23 08:45:43 +0000
34@@ -2,5 +2,5 @@
35 src/daemon.vala
36 src/utils.vala
37 src/main.vala
38-[type: gettext/ini]files-local.scope.in.in
39+[type: gettext/ini]local.scope.in.in
40

Subscribers

People subscribed via source and target branches