Merge lp:~townsend/libertine-scope/release-1.3.1 into lp:libertine-scope/release

[Christopher Townsend]

* Rename the scope to "Desktop Apps" per product management and design. (LP: #1602393)
* Fix parallel make and prevent generation of translations except during debuild.
* Suppress compiler warnings for header files included from libubuntu-app-launch.
* Restructure libertine-scope in preparation for adding the store scope.

[lp:~townsend/libertine-scope/release-1.3.1]

51. By Christopher Townsend on 2016-07-21

Merge lp:libertine-scope to fix some package name issues.

52. By Christopher Townsend on 2016-07-22

Merge lp:libertine-scope to add wildcard for matching lttng-ust-wait to avoid the apparmor spam in syslog.

[Larry Price (larryprice)]

lgtm!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-16 14:32:09 +0000
+++ CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -1,6 +1,8 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0.2)
+cmake_policy(SET CMP0048 NEW)
+
 project(libertine-scope
-        VERSION 1.3
+        VERSION 1.3.1
         LANGUAGES CXX)
 
 # We require at least g++ 4.9, to avoid ABI breakage with earlier versions.
@@ -24,40 +26,47 @@
 
 # Search for our dependencies
 include(GNUInstallDirs)
-find_package(PkgConfig)
+find_package(PkgConfig REQUIRED)
 find_package(Intltool)
 find_package(Qt5Core REQUIRED)
-find_package(Qt5Gui REQUIRED)
-
-pkg_check_modules(SCOPE libunity-scopes>=0.6.0 REQUIRED)
-pkg_check_modules(UAL ubuntu-app-launch-2>=0.5.0 REQUIRED)
-pkg_check_modules(LIBERTINE libertine REQUIRED)
+find_program(INTLTOOL_MERGE intltool-merge)
+
+# useful variables
+set(APPS_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
+set(APPS_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/unity/scopes/libertine-scope/)
+set(SCOPE_NAME "libertine-scope")
+set(SCOPE_DISPLAY_NAME "Desktop Apps")
+set(PACKAGE_NAME "libertine-scope.ubuntu")
+set(FULLY_QUALIFIED_NAME "${PACKAGE_NAME}_${SCOPE_NAME}")
+option(CLICK_MODE "Installs to a contained location" off)
+
+add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
+add_definitions(-DGETTEXT_PACKAGE="${SCOPE_NAME}")
+
+pkg_check_modules(SCOPE libunity-scopes>=1.0.0 REQUIRED)
+pkg_check_modules(UAL ubuntu-app-launch-2>=0.9.0 REQUIRED)
+pkg_check_modules(LIBERTINE libertine>=0.99 REQUIRED)
 
 # Add our dependencies to the include paths
 include_directories(
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libertine-scope
   ${SCOPE_INCLUDE_DIRS}
-  ${UAL_INCLUDE_DIRS}
+  SYSTEM ${UAL_INCLUDE_DIRS}
   ${LIBERTINE_INCLUDE_DIRS}
 )
 
-set(PACKAGE_NAME "libertine-scope.ubuntu")
 set(APP ${PROJECT})
 
 # Important project paths
-# Use this SCOPE_INSTALL_DIR when building the debian
-set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
-# USE this when building the click
-#set(SCOPE_INSTALL_DIR "/libertine-scope")
+if (CLICK_MODE)
+  set(SCOPE_INSTALL_DIR "/libertine-scope")
+else()
+  set(SCOPE_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/unity-scopes/libertine-scope/)
+endif(CLICK_MODE)
+
 set(SCOPE_NAME "libertine-scope")
 set(GETTEXT_PACKAGE "${SCOPE_NAME}")
 
-# If we need to refer to the scope's name or package in code, these definitions will help
-add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")
-add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
-add_definitions(-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
-
 # This command figures out the target architecture and puts it into the manifest file
 execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
                 OUTPUT_VARIABLE CLICK_ARCH
@@ -66,15 +75,20 @@
 
 # Configure and install the click manifest and apparmor files
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-install(FILES 
+if (CLICK_MODE)
+  install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
+        "libertine-scope.apparmor"
+        DESTINATION "/")
+else()
+  install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
         "libertine-scope.apparmor"
         DESTINATION ${SCOPE_INSTALL_DIR})
-#Use this DESTINATION when building click
-#        DESTINATION "/")
+endif()
 
 # Add our main directories
-add_subdirectory(libertine-scope)
+add_subdirectory(scope)
 add_subdirectory(data)
 add_subdirectory(po)
 

=== modified file 'README.md'
--- README.md	2016-01-06 14:55:03 +0000
+++ README.md	2016-07-22 13:46:06 +0000
@@ -19,18 +19,7 @@
 Testinmg the Scope
 ------------------
 
-To test the built scope, it needs to be be installed into a staging area first.
-That's because the Unity test tools have rigid assumptions about the layout of various
-installed data files, and the division between the sources and the built
-artifacts that the CMake toolchain delivers do not meet those assumptions.  SO
-be it:  installing into a staging area is no great hassle, but if you forget to
-do it in your compile/install/run cycle you will meet with frustration.
-
 Without system installation, you can test the scope using the unity-scope-tool
 package available in the Ubuntu archives.
 
-Here's the typical build/install/test cycle.
-
-    make install DESTDIR=/tmpstaging/
-    unity-scope-tool /tmp/staging/usr/local/lib/unity-scopes/libertine-scope/libertine-scope.ini
-
+    unity-scope-tool build/scope/apps/libertine-scope.ubuntu_libertine-scope.ini

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-06-13 18:06:36 +0000
+++ data/CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -1,26 +1,12 @@
 # Put the ini files in the build directory next to the scope
 # .so file so that the test tools can find them.
-intltool_merge_translations(
-  "libertine-scope.ini.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
-  ALL
-  UTF8
-)
-
-# Install the scope ini files
-install(
-  FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_${SCOPE_NAME}.ini"
-  DESTINATION
-    ${SCOPE_INSTALL_DIR}
-)
 
 # Install the scope images
 install(
   FILES
-    "icon.png"
+    "apps.png"
   DESTINATION
-    ${SCOPE_INSTALL_DIR}
+    ${APPS_DATA_DIR}
 )
 
 install(

=== renamed file 'data/icon.png' => 'data/apps.png'
=== renamed file 'data/icon.svg' => 'data/apps.svg'
=== removed file 'data/libertine-scope.ini.in'
--- data/libertine-scope.ini.in	2016-06-02 16:56:29 +0000
+++ data/libertine-scope.ini.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[ScopeConfig]
-_DisplayName=XApps
-_Description=Surface and launch DEB-packaged X11-based applications.
-Art=screenshot.png
-Author=The Canonical Libertine Team <[e-mail]>
-Icon=icon.png
-Keywords=apps

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-16 14:59:30 +0000
+++ debian/changelog	2016-07-22 13:46:06 +0000
@@ -1,3 +1,16 @@
+libertine-scope (1.3.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Chris Townsend ]
+  * Rename the scope to "Desktop Apps" per product management and design.
+    (LP: #1602393)
+
+  [ Larry Price ]
+  * Fix parallel make and prevent generation of translations except during debuild.
+  * Suppress compiler warnings for header files included from libubuntu-app-launch.
+  * Restructure libertine-scope in preparation for adding the store scope.
+
+ -- Chris Townsend <[e-mail]>  Wed, 20 Jul 2016 09:58:17 -0400
+
 libertine-scope (1.3+16.10.20160616-0ubuntu1) yakkety; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'debian/control'
--- debian/control	2016-05-04 14:37:57 +0000
+++ debian/control	2016-07-22 13:46:06 +0000
@@ -9,7 +9,7 @@
                dh-translations,
                google-mock,
                intltool,
-               libunity-scopes-dev (>= 0.6.0),
+               libunity-scopes-dev (>= 1.0.0),
                liburl-dispatcher1-dev,
                libubuntu-app-launch2-dev,
                liblibertine-dev,

=== modified file 'debian/rules'
--- debian/rules	2016-02-03 19:45:47 +0000
+++ debian/rules	2016-07-22 13:46:06 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f 
 
 %:
-	dh $@ --with translations
+	dh $@
 
+override_dh_auto_build:
+	dh_auto_build -- all translations

=== modified file 'libertine-scope.apparmor'
--- libertine-scope.apparmor	2016-06-09 11:58:58 +0000
+++ libertine-scope.apparmor	2016-07-22 13:46:06 +0000
@@ -8,7 +8,7 @@
         "@{CLICK_DIR}/*puritine*/"
     ],
     "write_path": [
-        "/{dev,run}/shm/lttng-ust-wait-5*"
+        "/{dev,run}/shm/lttng-ust-wait-*"
      ]
 }
 

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-06-03 13:50:46 +0000
+++ manifest.json.in	2016-07-22 13:46:06 +0000
@@ -10,6 +10,6 @@
     },
     "maintainer": "Ubuntu Libertine Team <[e-mail]>",
     "name": "@PACKAGE_NAME@",
-    "title": "@SCOPE_NAME@",
+    "title": "Desktop Apps",
     "version": "@PROJECT_VERSION@"
 }

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2016-06-09 16:25:23 +0000
+++ po/CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -1,21 +1,25 @@
 intltool_update_potfile(
-  ALL
   KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
   POTFILES_TEMPLATE POTFILES.in.in
+  COPYRIGHT_HOLDER "Canonical Ltd."
   GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
 )
 
-intltool_install_translations(
-  ALL
-  GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-)
+if (CLICK_MODE)
+  intltool_install_translations(
+    ALL
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+  )
+else()
+  intltool_install_translations(
+    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+  )
+endif(CLICK_MODE)
 
 file(GLOB_RECURSE ALL_POFILES "*.po")
 
 add_custom_target(potfiles
-  ALL
   SOURCES
     POTFILES.in.in
     ${GETTEXT_PACKAGE}.pot
-    ${ALL_POFILES}
-)
+    ${ALL_POFILES})

=== modified file 'po/POTFILES.in.in'
--- po/POTFILES.in.in	2016-02-27 03:27:46 +0000
+++ po/POTFILES.in.in	2016-07-22 13:46:06 +0000
@@ -1,2 +1,2 @@
-[type: gettext/ini] data/libertine-scope.ini.in
+[type: gettext/ini] scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in
 @GENERATED_POTFILES@

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2016-07-21 06:09:37 +0000
+++ po/en_AU.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-21 11:19+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-07-21 06:09:37 +0000
+++ po/en_GB.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-20 16:47+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/es.po'
--- po/es.po	2016-07-21 06:09:37 +0000
+++ po/es.po	2016-07-22 13:46:06 +0000
@@ -7,47 +7,21 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-06-21 12:46+0000\n"
 "Last-Translator: Víctor R. Ruiz <Unknown>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
 "Mostrar y ejecutar aplicaciones basadas en X11 y empaquetadas en DEB."
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/fi.po'
--- po/fi.po	2016-07-21 06:09:37 +0000
+++ po/fi.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-30 07:34+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/fr.po'
--- po/fr.po	2016-07-21 06:09:37 +0000
+++ po/fr.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-21 12:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/gl.po'
--- po/gl.po	2016-07-21 06:09:37 +0000
+++ po/gl.po	2016-07-22 13:46:06 +0000
@@ -7,47 +7,21 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-07-19 18:41+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
+"X-Launchpad-Export-Date: 2016-07-20 06:12+0000\n"
 "X-Generator: Launchpad (build 18147)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr "Aplicativos de escritorio"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
 "Inicia e executa aplicativos baseados en X11 empaquetados en formato DEB."
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/libertine-scope.pot'
--- po/libertine-scope.pot	2016-06-16 12:43:33 +0000
+++ po/libertine-scope.pot	2016-07-22 13:46:06 +0000
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Canonical Ltd.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-16 08:41-0400\n"
+"POT-Creation-Date: 2016-07-20 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,32 +17,36 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/libertine-scope.ini.in.h:1
-msgid "XApps"
+#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
+#: ../scope/apps/query.cpp:38
+msgid "Desktop Apps"
 msgstr ""
 
-#: ../data/libertine-scope.ini.in.h:2
+#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
 
-#: ../libertine-scope/query.cpp:38
-msgid "X Apps"
-msgstr ""
-
-#: ../libertine-scope/query.cpp:39
-msgid "Hidden X Apps"
-msgstr ""
-
-#: ../libertine-scope/query.cpp:43
+#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
+msgid "Search apps"
+msgstr ""
+
+#: ../scope/apps/query.cpp:39
+msgid "Hidden Desktop Apps"
+msgstr ""
+
+#: ../scope/apps/query.cpp:43
 msgid "Exclude Apps: "
 msgstr ""
 
 #. anonymous namespace
-#: ../libertine-scope/query.cpp:113
+#: ../scope/apps/query.cpp:113
 msgid ""
-"No XApps available. Install new applications with the Libertine Manager."
+"No applications available. Install new applications with the Libertine "
+"Manager."
 msgstr ""
 
-#: ../libertine-scope/query.cpp:114
-msgid "All XApps hidden. Reset filters or check the Hidden XApps department."
+#: ../scope/apps/query.cpp:114
+msgid ""
+"All applications hidden. Reset filters or check the Hidden Desktop Apps "
+"department."
 msgstr ""

=== modified file 'po/ms.po'
--- po/ms.po	2016-07-21 06:09:37 +0000
+++ po/ms.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-22 00:24+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/pt.po'
--- po/pt.po	2016-07-21 06:09:37 +0000
+++ po/pt.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-20 16:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== modified file 'po/uk.po'
--- po/uk.po	2016-07-21 06:09:37 +0000
+++ po/uk.po	2016-07-22 13:46:06 +0000
@@ -7,46 +7,20 @@
 msgstr ""
 "Project-Id-Version: libertine-scope\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-07-20 12:38-0400\n"
+"POT-Creation-Date: 2016-07-15 15:47-0400\n"
 "PO-Revision-Date: 2016-05-20 15:56+0000\n"
 "Last-Translator: Yuri Chornoivan <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-21 06:09+0000\n"
-"X-Generator: Launchpad (build 18147)\n"
+"X-Launchpad-Export-Date: 2016-07-17 06:22+0000\n"
+"X-Generator: Launchpad (build 18140)\n"
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:1
-#: ../scope/apps/query.cpp:38
+#: ../data/libertine-scope.ini.in.h:1
 msgid "Desktop Apps"
 msgstr ""
 
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:2
+#: ../data/libertine-scope.ini.in.h:2
 msgid "Surface and launch DEB-packaged X11-based applications."
 msgstr ""
-
-#: ../scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in.h:3
-msgid "Search apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:39
-msgid "Hidden Desktop Apps"
-msgstr ""
-
-#: ../scope/apps/query.cpp:43
-msgid "Exclude Apps: "
-msgstr ""
-
-#. anonymous namespace
-#: ../scope/apps/query.cpp:113
-msgid ""
-"No applications available. Install new applications with the Libertine "
-"Manager."
-msgstr ""
-
-#: ../scope/apps/query.cpp:114
-msgid ""
-"All applications hidden. Reset filters or check the Hidden Desktop Apps "
-"department."
-msgstr ""

=== added directory 'scope'
=== added file 'scope/CMakeLists.txt'
--- scope/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -0,0 +1,2 @@
+# add_subdirectory(libertine-store)
+add_subdirectory(apps)

=== renamed directory 'libertine-scope' => 'scope/apps'
=== modified file 'scope/apps/CMakeLists.txt'
--- libertine-scope/CMakeLists.txt	2016-06-07 21:09:04 +0000
+++ scope/apps/CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -1,26 +1,25 @@
-SET (CMAKE_AUTOMOC ON)
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+set (CMAKE_AUTOMOC ON)
 
 pkg_check_modules(URL_DISPATCHER REQUIRED url-dispatcher-1)
 
 # Find all the sources
-file(GLOB_RECURSE
-  SCOPE_SOURCES
+file(GLOB_RECURSE SCOPE_SOURCES
   "*.cpp"
   "*.h"
 )
 
-add_library(scope SHARED
+add_library(apps SHARED
   ${SCOPE_SOURCES}
 )
 
 include_directories(${URL_DISPATCHER_INCLUDE_DIRS})
 
-target_link_libraries(scope
+target_link_libraries(apps
   ${SCOPE_LDFLAGS}
   ${UAL_LDFLAGS}
   ${LIBERTINE_LDFLAGS}
   Qt5::Core
-  Qt5::Gui
   ${URL_DISPATCHER_LIBRARIES}
 )
 
@@ -29,11 +28,27 @@
   "${CMAKE_CURRENT_SOURCE_DIR}/config.h"
 )
 
-set_target_properties(scope
+set_target_properties(apps
   PROPERTIES
-    OUTPUT_NAME "${PACKAGE_NAME}_${SCOPE_NAME}"
-)
-install(TARGETS scope
-  LIBRARY DESTINATION ${SCOPE_INSTALL_DIR}
-)
-
+    OUTPUT_NAME ${FULLY_QUALIFIED_NAME}
+)
+
+install(TARGETS apps
+  LIBRARY DESTINATION "${APPS_LIB_DIR}"
+)
+
+set(APPS_INI_TARGET ${FULLY_QUALIFIED_NAME}.ini)
+configure_file(
+  ${APPS_INI_TARGET}.in.in
+  ${APPS_INI_TARGET}.in
+)
+
+add_custom_target(${APPS_INI_TARGET} ALL
+  COMMENT "Merging translations into ${APPS_INI_TARGET}"
+  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${APPS_INI_TARGET}.in ${APPS_INI_TARGET} >/dev/null
+)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${APPS_INI_TARGET}"
+  DESTINATION "${APPS_LIB_DIR}"
+)

=== modified file 'scope/apps/action.cpp'
--- libertine-scope/action.cpp	2016-06-13 20:47:13 +0000
+++ scope/apps/action.cpp	2016-07-22 13:46:06 +0000
@@ -16,9 +16,9 @@
  *	Kyle Nitzsche <[e-mail]>
  */
 
-#include "libertine-scope/action.h"
-#include "libertine-scope/config.h"
-#include "libertine-scope/hidden_apps.h"
+#include "scope/apps/action.h"
+#include "scope/apps/config.h"
+#include "scope/apps/hidden_apps.h"
 #include <unity/scopes/ActivationResponse.h>
 #include <unity/scopes/CannedQuery.h>
 #include <url-dispatcher.h>
@@ -40,6 +40,7 @@
 {
 }
 
+
 usc::ActivationResponse
 Action::activate()
 {
@@ -52,14 +53,14 @@
   {
     hidden_->add(QString::fromStdString(result()["app_id"].get_string()));
 
-    usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
+    usc::CannedQuery cq(SCOPE_PKG);
     return usc::ActivationResponse(cq);
   }
   else if (action_id_ == "show")
   {
     hidden_->remove(QString::fromStdString(result()["app_id"].get_string()));
 
-    usc::CannedQuery cq(SCOPE_PKG + "_" + SCOPE_APP);
+    usc::CannedQuery cq(SCOPE_PKG);
     return usc::ActivationResponse(cq);
   }
   return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);

=== modified file 'scope/apps/action.h'
--- libertine-scope/action.h	2016-06-13 20:47:13 +0000
+++ scope/apps/action.h	2016-07-22 13:46:06 +0000
@@ -19,7 +19,7 @@
 #ifndef SCOPE_ACTION_H_
 #define SCOPE_ACTION_H_
 
-#include "libertine-scope/scope.h"
+#include "scope/apps/scope.h"
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/ActivationQueryBase.h>
 #include <unity/scopes/ActivationResponse.h>

=== modified file 'scope/apps/applauncher.cpp'
--- libertine-scope/applauncher.cpp	2016-05-04 17:56:13 +0000
+++ scope/apps/applauncher.cpp	2016-07-22 13:46:06 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/applauncher.h"
+#include "scope/apps/applauncher.h"
 #include <ubuntu-app-launch/registry.h>
 
 

=== modified file 'scope/apps/blacklist.cpp'
--- libertine-scope/blacklist.cpp	2016-06-13 20:47:13 +0000
+++ scope/apps/blacklist.cpp	2016-07-22 13:46:06 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libertine-scope/blacklist.h"
+#include "scope/apps/blacklist.h"
 
 #include <QFile>
 #include <QTextStream>

=== modified file 'scope/apps/config.h.in'
--- libertine-scope/config.h.in	2016-06-08 15:45:39 +0000
+++ scope/apps/config.h.in	2016-07-22 13:46:06 +0000
@@ -17,7 +17,6 @@
 #define LIBERTINE_SCOPE_CONFIG_H_
 
 const std::string SCOPE_PKG = "@PACKAGE_NAME@";
-const std::string SCOPE_APP = "@SCOPE_NAME@";
 const std::string ROOT_DEPT_ID = "root_dept";
 const std::string HIDDEN_DEPT_ID = "hidden_dept";
 

=== modified file 'scope/apps/container.cpp'
--- libertine-scope/container.cpp	2016-05-04 17:56:13 +0000
+++ scope/apps/container.cpp	2016-07-22 13:46:06 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/container.h"
+#include "scope/apps/container.h"
 
 
 Container::

=== modified file 'scope/apps/container.h'
--- libertine-scope/container.h	2016-05-04 17:56:13 +0000
+++ scope/apps/container.h	2016-07-22 13:46:06 +0000
@@ -17,7 +17,7 @@
 #define LIBERTINE_SCOPE_CONTAINER_H
 
 
-#include "libertine-scope/applauncher.h"
+#include "scope/apps/applauncher.h"
 #include <string>
 #include <vector>
 

=== modified file 'scope/apps/hidden_apps.cpp'
--- libertine-scope/hidden_apps.cpp	2016-06-14 13:07:51 +0000
+++ scope/apps/hidden_apps.cpp	2016-07-22 13:46:06 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libertine-scope/hidden_apps.h"
+#include "scope/apps/hidden_apps.h"
 
 #include <QFile>
 #include <QTextStream>

=== added file 'scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in'
--- scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in	1970-01-01 00:00:00 +0000
+++ scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in	2016-07-22 13:46:06 +0000
@@ -0,0 +1,11 @@
+[ScopeConfig]
+_DisplayName=Desktop Apps
+_Description=Surface and launch DEB-packaged X11-based applications.
+Art=screenshot.png
+Author=The Canonical Libertine Team <[e-mail]>
+Icon=@APPS_DATA_DIR@/apps.png
+_SearchHint=Search apps
+Keywords=apps
+
+[Appearance]
+LogoOverlayColor=#ffffffff

=== modified file 'scope/apps/libertine.cpp'
--- libertine-scope/libertine.cpp	2016-06-04 20:23:12 +0000
+++ scope/apps/libertine.cpp	2016-07-22 13:46:06 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/libertine.h"
-#include "libertine-scope/container.h"
+#include "scope/apps/libertine.h"
+#include "scope/apps/container.h"
 #include <liblibertine/libertine.h>
 #include <glib.h>
 

=== modified file 'scope/apps/preview.cpp'
--- libertine-scope/preview.cpp	2016-06-10 15:11:56 +0000
+++ scope/apps/preview.cpp	2016-07-22 13:46:06 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/preview.h"
-#include "libertine-scope/config.h"
+#include "scope/apps/preview.h"
+#include "scope/apps/config.h"
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/VariantBuilder.h>

=== modified file 'scope/apps/query.cpp'
--- libertine-scope/query.cpp	2016-06-14 16:49:24 +0000
+++ scope/apps/query.cpp	2016-07-22 13:46:06 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/query.h"
-#include "libertine-scope/container.h"
-#include "libertine-scope/config.h"
-#include "libertine-scope/localization.h"
+#include "scope/apps/query.h"
+#include "scope/apps/container.h"
+#include "scope/apps/config.h"
+#include "scope/apps/localization.h"
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/QueryBase.h>
@@ -35,8 +35,8 @@
 
 namespace
 {
-static const auto ROOT_DEPT_TITLE = _("X Apps");
-static const auto HIDDEN_DEPT_TITLE = _("Hidden X Apps");
+static const auto ROOT_DEPT_TITLE = _("Desktop Apps");
+static const auto HIDDEN_DEPT_TITLE = _("Hidden Desktop Apps");
 static const auto DESCRIPTION_FIELD = "description";
 static const auto APP_ID_FIELD = "app_id";
 static const auto DEPARTMENT_ID_FIELD = "department_id";
@@ -110,8 +110,8 @@
 } // anonymous namespace
 
 
-std::string const Query::NO_RESULTS_HINT = _("No XApps available. Install new applications with the Libertine Manager.");
-std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All XApps hidden. Reset filters or check the Hidden XApps department.");
+std::string const Query::NO_RESULTS_HINT = _("No applications available. Install new applications with the Libertine Manager.");
+std::string const Query::ALL_RESULTS_FILTERED_HINT = _("All applications hidden. Reset filters or check the Hidden Desktop Apps department.");
 
 
 Query::

=== modified file 'scope/apps/query.h'
--- libertine-scope/query.h	2016-06-14 16:49:24 +0000
+++ scope/apps/query.h	2016-07-22 13:46:06 +0000
@@ -16,9 +16,9 @@
 #ifndef LIBERTINE_SCOPE_QUERY_H_
 #define LIBERTINE_SCOPE_QUERY_H_
 
-#include "libertine-scope/libertine.h"
-#include "libertine-scope/blacklist.h"
-#include "libertine-scope/hidden_apps.h"
+#include "scope/apps/libertine.h"
+#include "scope/apps/blacklist.h"
+#include "scope/apps/hidden_apps.h"
 #include <unity/scopes/ReplyProxyFwd.h>
 #include <unity/scopes/SearchQueryBase.h>
 #include <QStringList>

=== modified file 'scope/apps/scope.cpp'
--- libertine-scope/scope.cpp	2016-06-13 20:47:13 +0000
+++ scope/apps/scope.cpp	2016-07-22 13:46:06 +0000
@@ -13,12 +13,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libertine-scope/scope.h"
+#include "scope/apps/scope.h"
 
-#include "libertine-scope/preview.h"
-#include "libertine-scope/query.h"
-#include "libertine-scope/action.h"
-#include "libertine-scope/localization.h"
+#include "scope/apps/preview.h"
+#include "scope/apps/query.h"
+#include "scope/apps/action.h"
+#include "scope/apps/localization.h"
 #include <sstream>
 #include <url-dispatcher.h>
 #include <QFile>

=== modified file 'scope/apps/scope.h'
--- libertine-scope/scope.h	2016-01-19 21:10:09 +0000
+++ scope/apps/scope.h	2016-07-22 13:46:06 +0000
@@ -16,7 +16,7 @@
 #ifndef LIBERTINE_SCOPE_SCOPE_H_
 #define LIBERTINE_SCOPE_SCOPE_H_
 
-#include "libertine-scope/libertine.h"
+#include "scope/apps/libertine.h"
 #include <unity/scopes/PreviewQueryBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ReplyProxyFwd.h>

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-06-13 18:06:36 +0000
+++ tests/CMakeLists.txt	2016-07-22 13:46:06 +0000
@@ -11,7 +11,7 @@
   )
 
   target_link_libraries(${test_name}_exe
-    scope
+    apps
     Qt5::Core
     gmock
     gmock_main

=== modified file 'tests/fake_container.h'
--- tests/fake_container.h	2016-04-27 16:33:00 +0000
+++ tests/fake_container.h	2016-07-22 13:46:06 +0000
@@ -17,7 +17,7 @@
 #define LIBERTINE_SCOPE_FAKE_CONTAINER_H_
 
 
-#include "libertine-scope/container.h"
+#include "scope/apps/container.h"
 
 
 /**

=== modified file 'tests/fake_libertine.h'
--- tests/fake_libertine.h	2016-06-14 16:23:32 +0000
+++ tests/fake_libertine.h	2016-07-22 13:46:06 +0000
@@ -17,7 +17,7 @@
 #define LIBERTINE_SCOPE_FAKE_LIBERTINE_H_
 
 
-#include "libertine-scope/libertine.h"
+#include "scope/apps/libertine.h"
 
 
 /**

=== modified file 'tests/scopefixture.h'
--- tests/scopefixture.h	2016-04-15 12:41:58 +0000
+++ tests/scopefixture.h	2016-07-22 13:46:06 +0000
@@ -17,7 +17,7 @@
 #define LIBERTINE_SCOPE_SCOPEFIXTURE_H_
 
 #include <functional>
-#include "libertine-scope/scope.h"
+#include "scope/apps/scope.h"
 //#include <unity/scopes/testing/TypedScopeFixture.h>
 #include "tests/fake_container_json.h"
 #include "tests/fake_libertine.h"

=== modified file 'tests/test_blacklist.cpp'
--- tests/test_blacklist.cpp	2016-06-14 13:07:51 +0000
+++ tests/test_blacklist.cpp	2016-07-22 13:46:06 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libertine-scope/blacklist.h"
+#include "scope/apps/blacklist.h"
 #include <gtest/gtest.h>
 #include <QDir>
 #include <QTemporaryDir>

=== modified file 'tests/test_hidden_apps.cpp'
--- tests/test_hidden_apps.cpp	2016-06-14 13:07:51 +0000
+++ tests/test_hidden_apps.cpp	2016-07-22 13:46:06 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "libertine-scope/hidden_apps.h"
+#include "scope/apps/hidden_apps.h"
 #include <gtest/gtest.h>
 #include <QDir>
 #include <QTemporaryDir>

=== modified file 'tests/test_preview.cpp'
--- tests/test_preview.cpp	2016-06-06 22:38:47 +0000
+++ tests/test_preview.cpp	2016-07-22 13:46:06 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/preview.h"
+#include "scope/apps/preview.h"
 #include <unity/scopes/Variant.h>
 #include <gtest/gtest.h>
 #include <unity/scopes/ActionMetadata.h>

=== modified file 'tests/test_query.cpp'
--- tests/test_query.cpp	2016-06-14 16:49:24 +0000
+++ tests/test_query.cpp	2016-07-22 13:46:06 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libertine-scope/query.h"
-#include "libertine-scope/config.h"
+#include "scope/apps/query.h"
+#include "scope/apps/config.h"
 #include "tests/fake_libertine.h"
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/scopes/CannedQuery.h>