Merge lp:~jamesh/unity-lens-applications/master-scope into lp:unity-lens-applications

[James Henstridge]

Turn the main applications scope into a sub-scope, to allow other scopes to provide results of this type.

Turn the main applications scope into a sub-scope, to allow other scopes to provide results of this type.

This branch depends on lp:~jamesh/unity-scope-home/applications-master-scope being merged to keep a working system.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/21/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/21/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'Makefile.am'
--- Makefile.am	2013-05-16 11:37:05 +0000
+++ Makefile.am	2013-07-18 10:58:23 +0000
@@ -5,8 +5,11 @@
 # Install the applications.lens file
 #
 scope_in_files = applications.scope.in commands.scope.in
+
 scopedir = $(datadir)/unity/scopes
-scope_DATA = $(scope_in_files:.scope.in=.scope)
+scope_DATA = commands.scope
+appscopedir = $(scopedir)/applications
+appscope_DATA = applications.scope
 
 icondir = $(datadir)/unity/themes
 icon_DATA = applications.png
@@ -18,16 +21,16 @@
 # ChangeLog file created at distcheck time
 dist-hook:
 	@if test -d "$(srcdir)/.bzr"; \
-  	then \
-    	echo Creating ChangeLog && \
+	then \
+	echo Creating ChangeLog && \
       ( cd "$(top_srcdir)" && \
-      	echo '# Generated by Makefile. Do not edit.'; echo; \
+	echo '# Generated by Makefile. Do not edit.'; echo; \
         $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
         && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
         || (rm -f ChangeLog.tmp; \
 					echo Failed to generate ChangeLog >&2 ); \
 	else \
-  	echo Failed to generate ChangeLog: not a branch >&2; \
+	echo Failed to generate ChangeLog: not a branch >&2; \
   fi
 
 EXTRA_DIST = \