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

[Paweł Stołowski]

Fixed scope ids.

Fixed scope ids.

[PS Jenkins bot (ps-jenkins)]

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)

[Michal Hruby (mhr3)]

Missing configure.ac changes.

review: Needs Fixing

[lp:~stolowski/unity-lens-files/fix-scope-ids]

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

Updated configure.ac.

[PS Jenkins bot (ps-jenkins)]

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]

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

Updated POTFILES.in.

[PS Jenkins bot (ps-jenkins)]

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)

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-03-14 18:11:51 +0000
+++ Makefile.am	2013-04-23 08:45:43 +0000
@@ -1,9 +1,9 @@
 SUBDIRS = src data po tests
 
 #
-# Install the files-local.scope file
+# Install the local.scope file
 #
-scope_in_files = files-local.scope.in
+scope_in_files = local.scope.in
 scopedir = $(SCOPESDIR)/files
 scope_DATA = $(scope_in_files:.scope.in=.scope)
 
 
=== modified file 'configure.ac'
--- configure.ac	2013-03-12 13:43:11 +0000
+++ configure.ac	2013-04-23 08:45:43 +0000
@@ -121,7 +121,7 @@
 #####################################################
 AC_CONFIG_FILES([
   Makefile
-  files-local.scope.in
+  local.scope.in
   data/Makefile
   data/com.canonical.Unity.FilesLens.gschema.xml.in
   src/Makefile
 
=== renamed file 'files-local.scope.in.in' => 'local.scope.in.in'
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-03-13 11:01:29 +0000
+++ po/POTFILES.in	2013-04-23 08:45:43 +0000
@@ -2,5 +2,5 @@
 src/daemon.vala
 src/utils.vala
 src/main.vala
-[type: gettext/ini]files-local.scope.in.in
+[type: gettext/ini]local.scope.in.in